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

+act #3630 - Only fall back to default ctor if NoSuchMethodException

Browse source
This commit is contained in:
Viktor Klang 2013-11-22 17:13:24 -08:00
parent c35988de2c
commit 7588f04292
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -163,7 +163,7 @@ class Serialization(val system: ExtendedActorSystem) extends Extension {
*/ */
def serializerOf(serializerFQN: String): Try[Serializer] = def serializerOf(serializerFQN: String): Try[Serializer] =
system.dynamicAccess.createInstanceFor[Serializer](serializerFQN, List(classOf[ExtendedActorSystem] -> system)) recoverWith { system.dynamicAccess.createInstanceFor[Serializer](serializerFQN, List(classOf[ExtendedActorSystem] -> system)) recoverWith {
case _ ⇒ system.dynamicAccess.createInstanceFor[Serializer](serializerFQN, Nil) case _: NoSuchMethodException ⇒ system.dynamicAccess.createInstanceFor[Serializer](serializerFQN, Nil)
} }
/** /**

9
akka-docs/rst/scala/code/docs/event/LoggingDocSpec.scala
View file

@ -60,14 +60,14 @@ object LoggingDocSpec {
reqId += 1 reqId += 1
val always = Map("requestId" -> reqId) val always = Map("requestId" -> reqId)
val perMessage = currentMessage match { val perMessage = currentMessage match {
case r: Req => Map("visitorId" -> r.visitorId) case r: Req ⇒ Map("visitorId" -> r.visitorId)
case _ => Map() case _ ⇒ Map()
} }
always ++ perMessage always ++ perMessage
} }
def receive: Receive = { def receive: Receive = {
case r: Req => { case r: Req ⇒ {
log.info(s"Starting new request: ${r.work}") log.info(s"Starting new request: ${r.work}")
} }
} }
@ -75,7 +75,6 @@ object LoggingDocSpec {
//#mdc-actor //#mdc-actor
//#my-event-listener //#my-event-listener
import akka.event.Logging.InitializeLogger import akka.event.Logging.InitializeLogger
import akka.event.Logging.LoggerInitialized import akka.event.Logging.LoggerInitialized
@ -117,7 +116,7 @@ object LoggingDocSpec {
class LoggingDocSpec extends AkkaSpec { class LoggingDocSpec extends AkkaSpec {
import LoggingDocSpec.{MyActor, MdcActor, MdcActorMixin, Req} import LoggingDocSpec.{ MyActor, MdcActor, MdcActorMixin, Req }
"use a logging actor" in { "use a logging actor" in {
val myActor = system.actorOf(Props[MyActor]) val myActor = system.actorOf(Props[MyActor])