Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add exception-handling to interactions with servlet writers #1561

Merged
merged 2 commits into from
May 3, 2017
Merged

Add exception-handling to interactions with servlet writers #1561

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b316fc
Add exception-handling to interactions with servlet writers
mattrjacobs May 2, 2017
b46a563
Switch servlet exception handling from Throwable to Exception
mattrjacobs May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions ...ream/src/main/java/com/netflix/hystrix/contrib/sample/stream/HystrixSampleSseServlet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
});
Expand All @@ -166,7 +170,7 @@ public void onNext(String sampleDataAsString) {
moreDataWillBeSent.set(false);
}
writer.flush();
} catch (InterruptedException e) {
} catch (Exception ex) {
moreDataWillBeSent.set(false);
}
}
Expand Down