From adfb884c4ac012efaea2f7b33b8d6326ce349b32 Mon Sep 17 00:00:00 2001
From: Ngoc Dao <ngocdaothanh@gmail.com>
Date: Thu, 6 Mar 2014 10:43:36 +0900
Subject: [PATCH] Fix #315 Update Glokka from 1.4 to 1.6

---
 CHANGELOG.rst                                       |  2 +-
 build.sbt                                           |  2 +-
 .../scala/xitrum/sockjs/NonWebSocketSession.scala   | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 74d9188e..6409f57a 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -7,7 +7,7 @@
 * `#318 <https://github.com/ngocdaothanh/xitrum/issues/318>`_
   Fix Netty memory leak at xitrum.util.UrlSafeBase64
 * `#315 <https://github.com/ngocdaothanh/xitrum/issues/315>`_
-  Update Glokka from 1.4 to 1.5
+  Update Glokka from 1.4 to 1.6
 
 3.2:
 
diff --git a/build.sbt b/build.sbt
index 5e07a481..80e5a1fd 100644
--- a/build.sbt
+++ b/build.sbt
@@ -31,7 +31,7 @@ libraryDependencies += "io.netty" % "netty-all" % "4.0.17.Final"
 libraryDependencies += "org.javassist" % "javassist" % "3.18.1-GA"
 
 // For clustering SockJS; Akka is included here
-libraryDependencies += "tv.cntt" %% "glokka" % "1.5"
+libraryDependencies += "tv.cntt" %% "glokka" % "1.6"
 
 // Redirect Akka log to SLF4J
 libraryDependencies += "com.typesafe.akka" %% "akka-slf4j" % "2.2.4"
diff --git a/src/main/scala/xitrum/sockjs/NonWebSocketSession.scala b/src/main/scala/xitrum/sockjs/NonWebSocketSession.scala
index 4f4d0807..53fedfc7 100644
--- a/src/main/scala/xitrum/sockjs/NonWebSocketSession.scala
+++ b/src/main/scala/xitrum/sockjs/NonWebSocketSession.scala
@@ -113,23 +113,24 @@ class NonWebSocketSession(var receiverCliento: Option[ActorRef], pathPrefix: Str
       unwatchAndStop()
 
     case SubscribeFromReceiverClient =>
+      val s = sender()
       if (closed) {
-        sender ! SubscribeResultToReceiverClientClosed
+        s ! SubscribeResultToReceiverClientClosed
       } else {
         lastSubscribedAt = System.currentTimeMillis()
         if (receiverCliento.isEmpty) {
-          receiverCliento = Some(sender)
-          context.watch(sender)
+          receiverCliento = Some(s)
+          context.watch(s)
           context.setReceiveTimeout(SockJsAction.TIMEOUT_HEARTBEAT)
 
           if (bufferForClientSubscriber.isEmpty) {
-            sender ! SubscribeResultToReceiverClientWaitForMessage
+            s ! SubscribeResultToReceiverClientWaitForMessage
           } else {
-            sender ! SubscribeResultToReceiverClientMessages(bufferForClientSubscriber.toList)
+            s ! SubscribeResultToReceiverClientMessages(bufferForClientSubscriber.toList)
             bufferForClientSubscriber.clear()
           }
         } else {
-          sender ! SubscribeResultToReceiverClientAnotherConnectionStillOpen
+          s ! SubscribeResultToReceiverClientAnotherConnectionStillOpen
         }
       }