root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Catch RejectedExecutionException in WebAsyncManager 

Issue: SPR-13836
This commit is contained in:
Ian Chan 2016-01-02 14:41:10 +13:00 committed by Rossen Stoyanchev
parent 4818378c25
commit 93298fc9fa
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
spring-web/src/main/java/org/springframework/web/context/request/async/WebAsyncManager.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -21,6 +21,7 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import java.util.concurrent.RejectedExecutionException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
@ -306,24 +307,30 @@ public final class WebAsyncManager {
interceptorChain.applyBeforeConcurrentHandling(this.asyncWebRequest, callable); interceptorChain.applyBeforeConcurrentHandling(this.asyncWebRequest, callable);
startAsyncProcessing(processingContext); startAsyncProcessing(processingContext);
try {
this.taskExecutor.submit(new Runnable() { this.taskExecutor.submit(new Runnable() {
@Override @Override
public void run() { public void run() {
Object result = null; Object result = null;
try { try {
interceptorChain.applyPreProcess(asyncWebRequest, callable); interceptorChain.applyPreProcess(asyncWebRequest, callable);
result = callable.call(); result = callable.call();
}
catch (Throwable ex) {
result = ex;
}
finally {
result = interceptorChain.applyPostProcess(asyncWebRequest, callable, result);
}
setConcurrentResultAndDispatch(result);
} }
catch (Throwable ex) { });
result = ex; }
} catch (RejectedExecutionException ex) {
finally { Object result = interceptorChain.applyPostProcess(this.asyncWebRequest, callable, ex);
result = interceptorChain.applyPostProcess(asyncWebRequest, callable, result); setConcurrentResultAndDispatch(result);
} throw ex;
setConcurrentResultAndDispatch(result); }
}
});
} }
private void setConcurrentResultAndDispatch(Object result) { private void setConcurrentResultAndDispatch(Object result) {