summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/CompileServer.scala
diff options
context:
space:
mode:
authormihaylov <mihaylov@epfl.ch>2006-11-13 14:59:18 +0000
committermihaylov <mihaylov@epfl.ch>2006-11-13 14:59:18 +0000
commitf3047df95f007d48d0049ff78448d27045b20445 (patch)
tree47e848f238fad00e117a4244ec69c229945301df /src/compiler/scala/tools/nsc/CompileServer.scala
parentac255eaf858397ee14b8ffafd8066b100d5e6be4 (diff)
downloadscala-f3047df95f007d48d0049ff78448d27045b20445.tar.gz
scala-f3047df95f007d48d0049ff78448d27045b20445.tar.bz2
scala-f3047df95f007d48d0049ff78448d27045b20445.zip
Replaced == null()eq null(ne null)
Diffstat (limited to 'src/compiler/scala/tools/nsc/CompileServer.scala')
-rw-r--r--src/compiler/scala/tools/nsc/CompileServer.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/CompileServer.scala b/src/compiler/scala/tools/nsc/CompileServer.scala
index d407dd111a..48f30041a7 100644
--- a/src/compiler/scala/tools/nsc/CompileServer.scala
+++ b/src/compiler/scala/tools/nsc/CompileServer.scala
@@ -79,7 +79,7 @@ object CompileServer extends SocketServer {
val password = CompileSocket.getPassword(port)
val guessedPassword = in.readLine()
val input = in.readLine()
- if (input != null && password == guessedPassword) {
+ if ((input ne null) && password == guessedPassword) {
try {
inSession = true
progress = true
@@ -121,7 +121,7 @@ object CompileServer extends SocketServer {
reporter.info(null, command.usageMsg, true)
else {
try {
- if (compiler != null && settingsAreCompatible(command.settings, compiler.settings)) {
+ if ((compiler ne null) && settingsAreCompatible(command.settings, compiler.settings)) {
compiler.settings = command.settings
compiler.reporter = reporter
} else {