diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/actors/scala/actors/remote/RemoteActor.scala | 17 | ||||
-rw-r--r-- | src/actors/scala/actors/remote/TcpService.scala | 2 |
2 files changed, 7 insertions, 12 deletions
diff --git a/src/actors/scala/actors/remote/RemoteActor.scala b/src/actors/scala/actors/remote/RemoteActor.scala index a5adee6fff..6c01b770ca 100644 --- a/src/actors/scala/actors/remote/RemoteActor.scala +++ b/src/actors/scala/actors/remote/RemoteActor.scala @@ -38,23 +38,18 @@ package scala.actors.remote * } * </pre> * - * @version 0.9.17 + * @version 0.9.18 * @author Philipp Haller */ object RemoteActor { private val kernels = new scala.collection.mutable.HashMap[Actor, NetKernel] - private var cl: ClassLoader = try { - ClassLoader.getSystemClassLoader() - } catch { - case sec: SecurityException => - Debug.info(this+": caught "+sec) - null - case ise: IllegalStateException => - Debug.info(this+": caught "+ise) - null - } + /* If set to <code>null</code> (default), the default class loader + * of <code>java.io.ObjectInputStream</code> is used for deserializing + * objects sent as messages. + */ + private var cl: ClassLoader = null def classLoader: ClassLoader = cl def classLoader_=(x: ClassLoader) { cl = x } diff --git a/src/actors/scala/actors/remote/TcpService.scala b/src/actors/scala/actors/remote/TcpService.scala index 3630858e1a..b0b3b1392a 100644 --- a/src/actors/scala/actors/remote/TcpService.scala +++ b/src/actors/scala/actors/remote/TcpService.scala @@ -14,7 +14,7 @@ package scala.actors.remote import java.io.{DataInputStream, DataOutputStream, IOException} import java.lang.{Thread, SecurityException} -import java.net.{InetAddress, ServerSocket, Socket, UnknownHostException, URLClassLoader} +import java.net.{InetAddress, ServerSocket, Socket, UnknownHostException} import scala.collection.mutable.HashMap import scala.util.Random |