diff options
| author | michelou <michelou@epfl.ch> | 2010-12-08 18:28:43 +0000 |
|---|---|---|
| committer | michelou <michelou@epfl.ch> | 2010-12-08 18:28:43 +0000 |
| commit | 4dbe72f83f7ade1517bad7444009d3d0c8a69bd5 (patch) | |
| tree | 73a4ec0fe6c99dea6d0ac033774575f127671769 /src/detach | |
| parent | 6e15632fcbcb8578b30850ee93b3d3d8c9f3e7b9 (diff) | |
| download | scala-4dbe72f83f7ade1517bad7444009d3d0c8a69bd5.tar.gz scala-4dbe72f83f7ade1517bad7444009d3d0c8a69bd5.tar.bz2 scala-4dbe72f83f7ade1517bad7444009d3d0c8a69bd5.zip | |
minor code updates (detach plugin)
Diffstat (limited to 'src/detach')
5 files changed, 12 insertions, 12 deletions
diff --git a/src/detach/library/scala/remoting/Channel.scala b/src/detach/library/scala/remoting/Channel.scala index 8e8b79dea1..ba3f3c31e0 100644 --- a/src/detach/library/scala/remoting/Channel.scala +++ b/src/detach/library/scala/remoting/Channel.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2007-2010, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2007-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -51,7 +51,7 @@ class Channel protected (socket: Socket) { } catch { case e: Exception => - error("Class loader undefined: " + e.getMessage) + system.error("Class loader undefined: " + e.getMessage) null } def classLoader: ClassLoader = cl @@ -82,7 +82,7 @@ class Channel protected (socket: Socket) { } catch { case e: IOException => - error("Input stream undefined: "+e.getMessage+" ("+this+")") + system.error("Input stream undefined: "+e.getMessage+" ("+this+")") null } private lazy val out = @@ -91,7 +91,7 @@ class Channel protected (socket: Socket) { } catch { case e: IOException => - error("Output stream undefined: "+e.getMessage+" ("+this+")") + system.error("Output stream undefined: "+e.getMessage+" ("+this+")") null } diff --git a/src/detach/library/scala/remoting/Debug.scala b/src/detach/library/scala/remoting/Debug.scala index 7a3f0dd91e..bb5aa383d2 100644 --- a/src/detach/library/scala/remoting/Debug.scala +++ b/src/detach/library/scala/remoting/Debug.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2007-2009, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2007-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** diff --git a/src/detach/library/scala/remoting/ServerChannel.scala b/src/detach/library/scala/remoting/ServerChannel.scala index 6f9fe0a594..125f46ac8b 100644 --- a/src/detach/library/scala/remoting/ServerChannel.scala +++ b/src/detach/library/scala/remoting/ServerChannel.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2007-2010, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2007-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** diff --git a/src/detach/library/scala/remoting/detach.scala b/src/detach/library/scala/remoting/detach.scala index 5bb53da708..668dd982d9 100644 --- a/src/detach/library/scala/remoting/detach.scala +++ b/src/detach/library/scala/remoting/detach.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2010, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://www.scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** diff --git a/src/detach/library/scala/runtime/remoting/RegistryDelegate.scala b/src/detach/library/scala/runtime/remoting/RegistryDelegate.scala index ba6f6c042d..baf4249bbe 100644 --- a/src/detach/library/scala/runtime/remoting/RegistryDelegate.scala +++ b/src/detach/library/scala/runtime/remoting/RegistryDelegate.scala @@ -1,6 +1,6 @@ /* __ *\ ** ________ ___ / / ___ Scala API ** -** / __/ __// _ | / / / _ | (c) 2002-2008, LAMP/EPFL ** +** / __/ __// _ | / / / _ | (c) 2002-2011, LAMP/EPFL ** ** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ ** ** /____/\___/_/ |_/____/_/ | | ** ** |/ ** @@ -62,7 +62,7 @@ import java.rmi.server.UnicastRemoteObject * Thread.sleep(Long.MAX_VALUE) * } <b>catch</b> { * <b>case</b> e: InterruptedException => // do nothing - * <b>case</b> e: Throwable => e.printStackTrace(); System.exit(1) + * <b>case</b> e: Throwable => e.printStackTrace(); system.exit(1) * } * } while (<b>true</b>) * } @@ -115,14 +115,14 @@ object RMIDelegate { if (args.length > 0) { if (args(0) equals "-help") { println("Usage: rmidelegate <options> <port>") - exit(0) + system.exit(0) } try { port = args(0).toInt } catch { case e: NumberFormatException => println("Usage: rmidelegate <options> <port>") - exit(1) + system.exit(1) } val opts = args filter (_ startsWith "-J-D") for (opt <- opts) { @@ -149,7 +149,7 @@ object RMIDelegate { // do nothing case e: Throwable => e.printStackTrace() - exit(1) + system.exit(1) } } while (true) } |