From 1c2c0b2e5dd4b7dac1602d77c2602790307fd99e Mon Sep 17 00:00:00 2001
From: Viktor Klang <viktor.klang@gmail.com>
Date: Thu, 4 Nov 2010 12:51:20 +0100
Subject: [PATCH] Fixing issue with turning off secure cookies

---
 akka-remote/src/main/scala/remote/RemoteServer.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/akka-remote/src/main/scala/remote/RemoteServer.scala b/akka-remote/src/main/scala/remote/RemoteServer.scala
index bc50ebb781..95b70cacfe 100644
--- a/akka-remote/src/main/scala/remote/RemoteServer.scala
+++ b/akka-remote/src/main/scala/remote/RemoteServer.scala
@@ -76,7 +76,7 @@ object RemoteServer {
   }
   val REQUIRE_COOKIE                       = {
     val requireCookie = config.getBool("akka.remote.server.require-cookie", true)
-    if (RemoteServer.SECURE_COOKIE.isEmpty) throw new ConfigurationException(
+    if (requireCookie && RemoteServer.SECURE_COOKIE.isEmpty) throw new ConfigurationException(
       "Configuration option 'akka.remote.server.require-cookie' is turned on but no secure cookie is defined in 'akka.remote.secure-cookie'.")
     requireCookie
   }