Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure ISE will not be thrown when the client disconnects

Browse Source 
- ServletServerHttpResponse.ResponseAsyncListener#onError/onTimeout
must complete the async operation
- ServletHttpHandlerAdapter.HandlerResultSubscriber#onComplete must
check that the async operation is not completed

Issue: SPR-15412
This commit is contained in:
Violeta Georgieva
2017-04-04 21:36:29 +03:00
committed by Rossen Stoyanchev
parent de6f34893a
commit ece4815459
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-web/src/main/java/org/springframework/http/server/reactive/AbstractListenerReadPublisher.java
View File

@@ -49,7 +49,6 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
private final AtomicReference<State> state = new AtomicReference<>(State.UNSUBSCRIBED);
@SuppressWarnings("unused")
private volatile long demand;
@SuppressWarnings("rawtypes")
@@ -96,8 +95,8 @@ public abstract class AbstractListenerReadPublisher<T> implements Publisher<T> {
* Listeners can call this to notify when a read error has occurred.
*/
public final void onError(Throwable t) {
if (this.logger.isErrorEnabled()) {
this.logger.error(this.state + " onError: " + t, t);
if (this.logger.isTraceEnabled()) {
this.logger.trace(this.state + " onError: " + t);
}
this.state.get().onError(this, t);
}

28
spring-web/src/main/java/org/springframework/http/server/reactive/ServletHttpHandlerAdapter.java
View File

@@ -166,16 +166,32 @@ public class ServletHttpHandlerAdapter implements Servlet {
@Override
public void onError(Throwable ex) {
logger.error("Could not complete request", ex);
HttpServletResponse response = (HttpServletResponse) this.asyncContext.getResponse();
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
this.asyncContext.complete();
ServletRequest request = getRequest();
if (request != null && request.isAsyncStarted()) {
logger.error("Could not complete request", ex);
HttpServletResponse response = (HttpServletResponse) this.asyncContext.getResponse();
response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
this.asyncContext.complete();
}
}
@Override
public void onComplete() {
logger.debug("Successfully completed request");
this.asyncContext.complete();
ServletRequest request = getRequest();
if (request != null && request.isAsyncStarted()) {
logger.debug("Successfully completed request");
this.asyncContext.complete();
}
}
private ServletRequest getRequest() {
ServletRequest request = null;
try {
request = this.asyncContext.getRequest();
} catch (IllegalStateException ignore) {
// AsyncContext has been recycled and should not be used
}
return request;
}
}

2
spring-web/src/main/java/org/springframework/http/server/reactive/ServletServerHttpResponse.java
View File

@@ -180,11 +180,13 @@ public class ServletServerHttpResponse extends AbstractListenerServerHttpRespons
Throwable ex = event.getThrowable();
ex = (ex != null ? ex : new IllegalStateException("Async operation timeout."));
handleError(ex);
event.getAsyncContext().complete();
}
@Override
public void onError(AsyncEvent event) {
handleError(event.getThrowable());
event.getAsyncContext().complete();
}
void handleError(Throwable ex) {