From a9945f77f61f86833012cc0e18062514a6a33150 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Thu, 24 May 2012 12:19:39 +0200 Subject: [PATCH] Binary compat for serialization --- .../akka/serialization/DaemonMsgCreateSerializer.scala | 8 ++++---- .../akka/serialization/DaemonMsgWatchSerializer.scala | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala b/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala index ce54ff5adb..2905c3ef3b 100644 --- a/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala +++ b/akka-remote/src/main/scala/akka/serialization/DaemonMsgCreateSerializer.scala @@ -30,8 +30,10 @@ import akka.actor.FromClassCreator * Serialization of contained RouterConfig, Config, and Scope * is done with configured serializer for those classes, by * default java.io.Serializable. + * + * INTERNAL API */ -class DaemonMsgCreateSerializer(val system: ExtendedActorSystem) extends Serializer { +private[akka] class DaemonMsgCreateSerializer(val system: ExtendedActorSystem) extends Serializer { import ProtobufSerializer.serializeActorRef import ProtobufSerializer.deserializeActorRef @@ -81,7 +83,7 @@ class DaemonMsgCreateSerializer(val system: ExtendedActorSystem) extends Seriali def fromBinary(bytes: Array[Byte], clazz: Option[Class[_]]): AnyRef = { val proto = DaemonMsgCreateProtocol.parseFrom(bytes) - def deploy(protoDeploy: DeployProtocol) = { + def deploy(protoDeploy: DeployProtocol): Deploy = { val config = if (protoDeploy.hasConfig) deserialize(protoDeploy.getConfig, classOf[Config]) else ConfigFactory.empty @@ -146,7 +148,5 @@ class DaemonMsgCreateSerializer(val system: ExtendedActorSystem) extends Seriali case _ ⇒ throw e // the first exception } } - } - } \ No newline at end of file diff --git a/akka-remote/src/main/scala/akka/serialization/DaemonMsgWatchSerializer.scala b/akka-remote/src/main/scala/akka/serialization/DaemonMsgWatchSerializer.scala index 0ca5216da0..016d7f14cb 100644 --- a/akka-remote/src/main/scala/akka/serialization/DaemonMsgWatchSerializer.scala +++ b/akka-remote/src/main/scala/akka/serialization/DaemonMsgWatchSerializer.scala @@ -12,8 +12,10 @@ import akka.actor.ExtendedActorSystem /** * Serializes akka's internal DaemonMsgWatch using protobuf. + * + * INTERNAL API */ -class DaemonMsgWatchSerializer(val system: ExtendedActorSystem) extends Serializer { +private[akka] class DaemonMsgWatchSerializer(val system: ExtendedActorSystem) extends Serializer { import ProtobufSerializer.serializeActorRef import ProtobufSerializer.deserializeActorRef