Merge pull request Netflix#1442 from mattrjacobs/fix-1430

Fix Netflix#1430 by detecting case when client connect/disconnects before me…
rwilliams-r7 · Dec 14, 2016 · 11ca011 · 11ca011
2 parents 9263593 + 62d9c30
commit 11ca011
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/...ream/src/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixSampleSseServlet.java b/...ream/src/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixSampleSseServlet.java
@@ -163,8 +163,17 @@ public void onNext(String sampleDataAsString) {
                 while (moreDataWillBeSent.get() && !isDestroyed) {
                     try {
                         Thread.sleep(pausePollerThreadDelayInMs);
+                        //in case stream has not started emitting yet, catch any clients which connect/disconnect before emits start
+                        writer.print("ping: \n\n");
+                        // explicitly check for client disconnect - PrintWriter does not throw exceptions
+                        if (writer.checkError()) {
+                            throw new IOException("io error");
+                        }
+                        writer.flush();
                     } catch (InterruptedException e) {
                         moreDataWillBeSent.set(false);
+                    } catch (IOException ioe) {
+                        moreDataWillBeSent.set(false);
                     }
                 }
             }