commit da8acb27d77c2a3a07064b66fb4804c27ba0580d
author massakam <massakam@yahoo-corp.jp> Wed Dec 06 17:00:19 2017 +0900
committer Nozomi Kurihara <nkurihar@apache.org> Wed Dec 06 18:40:44 2017 +0900
tree b2c2ae13a4d4b4e508f55d0f8a5a35a0c7ae7b12
parent 88d9474fd8cbd5cd5599d1329948cfebe6f5e7f9

Start receiving messages after WebSocket session established (#943)

pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java

diff --git a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java
index d6fd28b..ff9c641 100644
--- a/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java
+++ b/pulsar-websocket/src/main/java/org/apache/pulsar/websocket/ConsumerHandler.java
@@ -40,6 +40,7 @@
 import org.apache.pulsar.common.util.ObjectMapperFactory;
 import org.apache.pulsar.websocket.data.ConsumerAck;
 import org.apache.pulsar.websocket.data.ConsumerMessage;
+import org.eclipse.jetty.websocket.api.Session;
 import org.eclipse.jetty.websocket.api.WriteCallback;
 import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse;
 import org.slf4j.Logger;
@@ -91,7 +92,6 @@
                 log.warn("[{}:{}] Failed to add consumer handler for topic {}", request.getRemoteAddr(),
                         request.getRemotePort(), topic);
             }
-            receiveMessage();
         } catch (Exception e) {
             log.warn("[{}:{}] Failed in creating subscription {} on topic {}", request.getRemoteAddr(),
                     request.getRemotePort(), subscription, topic, e);
@@ -168,6 +168,12 @@
     }
 
     @Override
+    public void onWebSocketConnect(Session session) {
+        super.onWebSocketConnect(session);
+        receiveMessage();
+    }
+
+    @Override
     public void onWebSocketText(String message) {
         super.onWebSocketText(message);