Cleaner implementation of server detecting client disconnection in sampling stream

Author: mattrjacobs

hystrix-contrib/hystrix-metrics-event-stream/src/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixSampleSseServlet.java

@@ -146,16 +146,12 @@ public void onError(Throwable e) {
                             @Override
                             public void onNext(String sampleDataAsString) {
                                 if (sampleDataAsString != null) {
-                                    try {
-                                        writer.print("data: " + sampleDataAsString + "\n\n");
-                                        // explicitly check for client disconnect - PrintWriter does not throw exceptions
-                                        if (writer.checkError()) {
-                                            throw new IOException("io error");
-                                        }
-                                        writer.flush();
-                                    } catch (IOException ioe) {
+                                    writer.print("data: " + sampleDataAsString + "\n\n");
+                                    // explicitly check for client disconnect - PrintWriter does not throw exceptions
+                                    if (writer.checkError()) {
                                         moreDataWillBeSent.set(false);
                                     }
+                                    writer.flush();
                                 }
                             }
                         });
@@ -167,17 +163,16 @@ public void onNext(String sampleDataAsString) {
                         writer.print("ping: \n\n");
                         // explicitly check for client disconnect - PrintWriter does not throw exceptions
                         if (writer.checkError()) {
-                            throw new IOException("io error");
+                            moreDataWillBeSent.set(false);
                         }
                         writer.flush();
                     } catch (InterruptedException e) {
                         moreDataWillBeSent.set(false);
-                    } catch (IOException ioe) {
-                        moreDataWillBeSent.set(false);
                     }
                 }
             }
         } finally {
+            System.out.println("Exiting the server thread, current count = " + getNumberCurrentConnections());
             decrementCurrentConcurrentConnections();
             if (sampleSubscription != null && !sampleSubscription.isUnsubscribed()) {
                 sampleSubscription.unsubscribe();