Skip to content

Commit

Permalink
Fixes #1643
Browse files Browse the repository at this point in the history
  • Loading branch information
jfarcand committed Jun 24, 2014
1 parent be0d030 commit c56e406
Showing 1 changed file with 5 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -850,16 +850,13 @@ public void closeStreamOrWriter() {
if (resource() != null && resource().transport() != AtmosphereResource.TRANSPORT.WEBSOCKET) {
try {
if (isUsingStream()) {
try {
getOutputStream().close();
} catch (java.lang.IllegalStateException ex) {
logger.trace("", ex);
}
getOutputStream().close();
} else {
getWriter().close();
}
} catch (IOException e) {
logger.trace("", e);
} catch (Exception e) {
//https://github.com/Atmosphere/atmosphere/issues/1643
logger.trace("Unexpected exception", e);
}
}
}
Expand Down Expand Up @@ -1102,6 +1099,7 @@ public final static AtmosphereResponse wrap(HttpServletResponse response) {

/**
* Return the {@link org.atmosphere.cpr.AtmosphereResource#uuid()} used by this object.
*
* @return the {@link org.atmosphere.cpr.AtmosphereResource#uuid()} used by this object.
*/
public String uuid() {
Expand Down

0 comments on commit c56e406

Please sign in to comment.