Merge pull request kaazing#27 from pkhanal/develop

sanjay-saxena · sanjay-saxena · commit cf314c0eb295 · 2015-07-09T10:20:01.000-07:00
Issue kaazing#12: Close event fired only after all outstanding requests are completed
diff --git a/ws/ws/src/main/java/org/kaazing/gateway/client/impl/wseb/DownstreamHandlerImpl.java b/ws/ws/src/main/java/org/kaazing/gateway/client/impl/wseb/DownstreamHandlerImpl.java
@@ -145,8 +145,11 @@ private void reconnectIfNecessary(DownstreamChannel channel) {
         LOG.entering(CLASS_NAME, "reconnectIfNecessary");
 
         if (channel.closing.get() == true) {
-            LOG.fine("Closing: "+channel);
-            listener.downstreamClosed(channel);
+            if (channel.outstandingRequests.size() == 0) {
+                LOG.fine("Closing: "+channel);
+                listener.downstreamClosed(channel);
+            }
+            
         }
         else if (channel.reconnecting.compareAndSet(true, false)) {
             // reconnect if necessary
@@ -361,13 +364,12 @@ public void requestProgressed(HttpRequest request, WrappedByteBuffer payload) {
             public void requestLoaded(HttpRequest request, HttpResponse response) {
                 LOG.entering(CLASS_NAME, "requestLoaded", request);
                 DownstreamChannel channel = (DownstreamChannel) request.parent;
+                channel.outstandingRequests.remove(request);
                 reconnectIfNecessary(channel);
             }
 
             @Override
             public void requestClosed(HttpRequest request) {
-                DownstreamChannel channel = (DownstreamChannel) request.parent;
-                channel.outstandingRequests.remove(request);
             }
 
             @Override
diff --git a/ws/ws/src/test/java/org/kaazing/gateway/client/impl/ws/WebSocketIT.java b/ws/ws/src/test/java/org/kaazing/gateway/client/impl/ws/WebSocketIT.java
@@ -23,13 +23,15 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.rules.RuleChain.outerRule;
 
 import java.io.IOException;
 import java.net.URI;
 
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -42,6 +44,7 @@
 import org.kaazing.net.ws.WebSocketException;
 import org.kaazing.net.ws.WebSocketFactory;
 import org.kaazing.net.ws.WebSocketMessageReader;
+import org.kaazing.net.ws.WebSocketMessageType;
 import org.kaazing.net.ws.WebSocketMessageWriter;
 
 
@@ -202,12 +205,14 @@ public void clientShouldReceiveDataOverLongpollingRequest() throws Exception {
         WebSocketMessageReader reader = webSocket.getMessageReader();
 
         //read Hello
-        reader.next();
+        WebSocketMessageType messageType = reader.next();
+        assertSame(WebSocketMessageType.TEXT, messageType);
         String message = (String) reader.getText();
         assertEquals("Hello, WebSocket!", message);
 
-        webSocket.close();
-
+        // connection closed by server
+        messageType = reader.next();
+        assertSame(WebSocketMessageType.EOS, messageType);
         k3po.finish();
     }
 
diff --git a/ws/ws/src/test/scripts/org/kaazing/gateway/client/impl/ws/echo.payload.over.wse.rpt b/ws/ws/src/test/scripts/org/kaazing/gateway/client/impl/ws/echo.payload.over.wse.rpt
@@ -26,7 +26,7 @@ connected
 read method "GET"
 read version "HTTP/1.1"
 read header "X-WebSocket-Version" "wseb-1.0"
-read header "X-Sequence-No" /(?<sequence>\b[0-9]{1,3}\b)/
+read header "X-Sequence-No" /(?<sequence>[0-9]{1,3})/
 read header "X-Accept-Commands" "ping"
 read closed
 
diff --git a/ws/ws/src/test/scripts/org/kaazing/gateway/client/impl/ws/receive.data.over.longpolling.request.rpt b/ws/ws/src/test/scripts/org/kaazing/gateway/client/impl/ws/receive.data.over.longpolling.request.rpt
@@ -27,7 +27,7 @@ connected
 read method "GET"
 read version "HTTP/1.1"
 read header "X-WebSocket-Version" "wseb-1.0"
-read header "X-Sequence-No" /(?<sequence>\b[0-9]{1,3}\b)/
+read header "X-Sequence-No" /(?<sequence>[0-9]{1,3})/
 read header "X-Accept-Commands" "ping"
 read closed
 
@@ -85,3 +85,21 @@ write "Hello, WebSocket!"
 write [0x01 0x30 0x32 0xFF]
 write [0x01 0x30 0x31 0xFF]
 write close
+
+# Upstream
+accept http://localhost:8001/echo/;e/ubm/NMLBn6kH9nyesgt34tOvDai9EmdrGYSI
+accepted
+connected
+
+read method "POST"
+read version "HTTP/1.1"
+read header "X-Sequence-No" ${wse:asString(sequence + 1)}
+
+read [0x01 0x30 0x32 0xFF]
+read [0x01 0x30 0x31 0xFF]
+read closed
+
+write status "200" "OK"
+write version "HTTP/1.1"
+write header content-length
+write close
