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

Do not reference remote settings directly as it breaks if remoting is not on classpath (#21604)

Browse source
This commit is contained in:
Johan Andrén 2016-09-30 15:33:50 +02:00 • committed by GitHub
parent aeffb380fc
commit ed6c93adea
1 changed files with 1 additions and 1 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

@ -39,7 +39,7 @@ object Serialization {
val defaultBindings = config.getConfig("akka.actor.serialization-bindings")
val bindings =
if (config.getBoolean("akka.actor.enable-additional-serialization-bindings") ||
config.getBoolean("akka.remote.artery.enabled"))
config.hasPath("akka.remote.artery.enabled") && config.getBoolean("akka.remote.artery.enabled"))
defaultBindings.withFallback(config.getConfig("akka.actor.additional-serialization-bindings"))
else defaultBindings
configToMap(bindings)