Merge pull request Netflix#1561 from mattrjacobs/add-error-handling-sample-sse-servlet

Add exception-handling to interactions with servlet writers

Author: mattrjacobs

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

@@ -146,12 +146,16 @@ public void onError(Throwable e) {
                             @Override
                             public void onNext(String sampleDataAsString) {
                                 if (sampleDataAsString != null) {
-                                    writer.print("data: " + sampleDataAsString + "\n\n");
-                                    // explicitly check for client disconnect - PrintWriter does not throw exceptions
-                                    if (writer.checkError()) {
+                                    try {
+                                        writer.print("data: " + sampleDataAsString + "\n\n");
+                                        // explicitly check for client disconnect - PrintWriter does not throw exceptions
+                                        if (writer.checkError()) {
+                                            moreDataWillBeSent.set(false);
+                                        }
+                                        writer.flush();
+                                    } catch (Exception ex) {
                                         moreDataWillBeSent.set(false);
                                     }
-                                    writer.flush();
                                 }
                             }
                         });
@@ -166,7 +170,7 @@ public void onNext(String sampleDataAsString) {
                             moreDataWillBeSent.set(false);
                         }
                         writer.flush();
-                    } catch (InterruptedException e) {
+                    } catch (Exception ex) {
                         moreDataWillBeSent.set(false);
                     }
                 }