WS fix

graniteds · Apr 9, 2015 · 5cd2882 · 5cd2882
1 parent 226e591
commit 5cd2882
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...ite-server-core/src/main/java/org/granite/gravity/websocket/AbstractWebSocketChannel.java b/...ite-server-core/src/main/java/org/granite/gravity/websocket/AbstractWebSocketChannel.java
@@ -304,7 +304,8 @@ public boolean runReceived(AsyncHttpContext asyncHttpContext) {
                     sendBytes(msg);
             	}
             }
-
+            log.debug("Channel %s binary messages sent");
+
             return true; // Messages were delivered, http context isn't valid anymore.
         }
         catch (IOException e) {

diff --git a/granite-server-servlet3/src/main/java/org/granite/gravity/websocket/WebSocketChannel.java b/granite-server-servlet3/src/main/java/org/granite/gravity/websocket/WebSocketChannel.java
@@ -101,7 +101,10 @@ public void close(boolean timeout) {
         log.debug("Channel %s close%s (was %s)", getId(), timeout ? " (timeout)" : "", session == null ? "(no session)" : (session.isOpen() ? "(open)" : "(not open)"));
 		if (session != null) {
             try {
-                session.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, timeout ? "Idle timeout" : "Channel closed"));
+            	if (timeout)
+            		session.close(new CloseReason(CloseReason.CloseCodes.GOING_AWAY, "Idle timeout"));
+            	else
+                	session.close(new CloseReason(CloseReason.CloseCodes.NORMAL_CLOSURE, "Channel closed"));
             }
             catch (Exception e) {
             	log.error(e, "Could not close channel %s", getId());