From ed6c93adea146c938bdbf4be31d5e1dd41ca3faa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Fri, 30 Sep 2016 15:33:50 +0200 Subject: [PATCH] Do not reference remote settings directly as it breaks if remoting is not on classpath (#21604) --- .../src/main/scala/akka/serialization/Serialization.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/akka-actor/src/main/scala/akka/serialization/Serialization.scala b/akka-actor/src/main/scala/akka/serialization/Serialization.scala index 7dfdf6eff1..5143402ec7 100644 --- a/akka-actor/src/main/scala/akka/serialization/Serialization.scala +++ b/akka-actor/src/main/scala/akka/serialization/Serialization.scala @@ -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)