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

Merge pull request #716 from akka/wip-perf001-√

Browse source 
Wip perf001 √
This commit is contained in:
Viktor Klang (√) 2012-09-19 03:07:31 -07:00
commit aa1ff1a7b8
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -9,7 +9,6 @@ import com.typesafe.config.Config
import akka.actor.{ Extension, ExtendedActorSystem, Address, DynamicAccess } import akka.actor.{ Extension, ExtendedActorSystem, Address, DynamicAccess }
import akka.event.Logging import akka.event.Logging
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import scala.util.control.NonFatal
import scala.collection.mutable.ArrayBuffer import scala.collection.mutable.ArrayBuffer
import java.io.NotSerializableException import java.io.NotSerializableException
import util.{ Try, DynamicVariable } import util.{ Try, DynamicVariable }
@ -100,8 +99,8 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
// bindings are ordered from most specific to least specific // bindings are ordered from most specific to least specific
def unique(possibilities: Seq[(Class[_], Serializer)]): Boolean = def unique(possibilities: Seq[(Class[_], Serializer)]): Boolean =
possibilities.size == 1 || possibilities.size == 1 ||
(possibilities map (_._1) forall (_ isAssignableFrom possibilities(0)._1)) || (possibilities forall (_._1 isAssignableFrom possibilities(0)._1)) ||
(possibilities map (_._2) forall (_ == possibilities(0)._2)) (possibilities forall (_._2 == possibilities(0)._2))
val ser = bindings filter { _._1 isAssignableFrom clazz } match { val ser = bindings filter { _._1 isAssignableFrom clazz } match {
case Seq() ⇒ case Seq() ⇒