Updated Branches:
  refs/heads/master 19dcb9630 -> 313618a0b

WebSocketChannelImpl sendMessageString() fix


Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/313618a0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/313618a0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/313618a0

Branch: refs/heads/master
Commit: 313618a0b1162fdd44d83f1384b966f006fa0158
Parents: 19dcb96
Author: Andrew Kaplanov <[email protected]>
Authored: Fri Jan 17 12:49:28 2014 +0200
Committer: Yuri Zelikov <[email protected]>
Committed: Fri Jan 17 12:50:44 2014 +0200

----------------------------------------------------------------------
 .../box/server/rpc/WebSocketChannelImpl.java            | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/313618a0/src/org/waveprotocol/box/server/rpc/WebSocketChannelImpl.java
----------------------------------------------------------------------
diff --git a/src/org/waveprotocol/box/server/rpc/WebSocketChannelImpl.java 
b/src/org/waveprotocol/box/server/rpc/WebSocketChannelImpl.java
index a244155..c74e07a 100644
--- a/src/org/waveprotocol/box/server/rpc/WebSocketChannelImpl.java
+++ b/src/org/waveprotocol/box/server/rpc/WebSocketChannelImpl.java
@@ -67,14 +67,12 @@ public class WebSocketChannelImpl extends WebSocketChannel {
 
   @Override
   protected void sendMessageString(String data) throws IOException {
-    Session s;
     synchronized (this) {
-      s = session;
-    }
-    if (s == null) {
-      LOG.warning("Websocket is not connected");
-    } else {
-      s.getRemote().sendStringByFuture(data);
+      if (session == null) {
+        LOG.warning("Websocket is not connected");
+      } else {
+        session.getRemote().sendStringByFuture(data);
+      }
     }
   }
 }

Reply via email to