Merge pull request kaazing#39 from huston007/develop

David Witherspoon · web-flow · commit 511deb6162ee · 2017-04-24T14:04:19.000-07:00
Store event name untill all data received completely
diff --git a/ws/ws/src/main/java/org/kaazing/net/sse/impl/SseEventStream.java b/ws/ws/src/main/java/org/kaazing/net/sse/impl/SseEventStream.java
@@ -72,6 +72,7 @@ public HttpRequestHandler createHandler() {
     private String                 sseLocation;
     private long                   retry = 3000; // same as actionscript implementation
     private boolean                immediateReconnect = false;
+    private String                 name = MESSAGE; // event name stores here between data receiving progress events
     private String                 messageBuffer = "";
     private HttpRequest            sseSource;
     private AtomicBoolean          progressEventReceived = new AtomicBoolean(false);
@@ -183,7 +184,7 @@ private synchronized void processProgressEvent(String message) {
             messageBuffer = messageBuffer + message;
             String field = null;
             String value = null;
-            String name = MESSAGE;
+            name = name != null ? name : MESSAGE;
             String data = "";
             immediateReconnect = false;
             while (!aborted && !errored) {
@@ -199,6 +200,7 @@ private synchronized void processProgressEvent(String message) {
                             dataBuffer.replace(dataBufferlength - 1, dataBufferlength, "");
                         }
                         doMessage(name, dataBuffer.toString());
+                        name = null;
                         dataBuffer.setLength(0);
                     }
                 }
