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

review-based improvements on Serialization

Browse source
This commit is contained in:
Roland 2012-02-07 16:21:48 +01:00
parent 224ce7f773
commit c40d76c0ab
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -126,17 +126,18 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
serializerMap.get(clazz) match {
case null ⇒
// bindings are ordered from most specific to least specific
def unique(cs: Seq[Class[_]], ser: Set[Serializer]): Boolean = (cs forall (_ isAssignableFrom cs(0))) || ser.size == 1
def unique(possibilities: Seq[(Class[_], Serializer)]): Boolean =
possibilities.size == 1 ||
(possibilities map (_._1) forall (_ isAssignableFrom possibilities(0)._1)) ||
(possibilities map (_._2) forall (_ == possibilities(0)._2))
val possible = bindings filter { _._1 isAssignableFrom clazz }
val ser = possible.size match {
case 0 ⇒
val ser = bindings filter { _._1 isAssignableFrom clazz } match {
case Seq() ⇒
throw new NotSerializableException("No configured serialization-bindings for class [%s]" format clazz.getName)
case x if x == 1 || unique(possible map (_._1), possible.map(_._2)(scala.collection.breakOut)) ⇒
possible(0)._2
case _ ⇒
log.warning("Multiple serializers found for " + clazz + ", choosing first: " + possible)
possible(0)._2
case possibilities ⇒
if (!unique(possibilities))
log.warning("Multiple serializers found for " + clazz + ", choosing first: " + possibilities)
possibilities(0)._2
}
serializerMap.putIfAbsent(clazz, ser) match {
case null ⇒