raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Huge refactor + preparing for binary compatibility, last stretch for akka-actor.jar...

Browse source
This commit is contained in:
Viktor Klang 2012-05-18 19:25:43 +02:00
parent 134f1a19a5
commit 94e71b7a18
18 changed files with 218 additions and 408 deletions
Download patch file Download diff file Expand all files Collapse all files

12
akka-actor/src/main/scala/akka/serialization/Serialization.scala
View file

@ -14,8 +14,6 @@ import akka.util.NonFatal
import scala.collection.mutable.ArrayBuffer
import java.io.NotSerializableException
case class NoSerializerFoundException(m: String) extends AkkaException(m)
object Serialization {
/**
@ -120,9 +118,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
possibilities(0)._2
}
serializerMap.putIfAbsent(clazz, ser) match {
case null ⇒
log.debug("Using serializer[{}] for message [{}]", ser.getClass.getName, clazz.getName)
ser
case null ⇒ log.debug("Using serializer[{}] for message [{}]", ser.getClass.getName, clazz.getName); ser
case some ⇒ some
}
case ser ⇒ ser
@ -140,10 +136,8 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
* A Map of serializer from alias to implementation (class implementing akka.serialization.Serializer)
* By default always contains the following mapping: "java" -> akka.serialization.JavaSerializer
*/
private val serializers: Map[String, Serializer] = {
for ((k: String, v: String) ← settings.Serializers)
yield k -> serializerOf(v).fold(throw _, identity)
}
private val serializers: Map[String, Serializer] =
for ((k: String, v: String) ← settings.Serializers) yield k -> serializerOf(v).fold(throw _, identity)
/**
* bindings is a Seq of tuple representing the mapping from Class to Serializer.