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

Catch RejectedExecutionException in WebAsyncManager

Browse Source 
Issue: SPR-13836
This commit is contained in:
Ian Chan
2016-01-02 14:41:10 +13:00
committed by Rossen Stoyanchev
parent 73df50db3c
commit 29692fcc21
1 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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,7 +307,7 @@ 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() {
@@ -325,6 +326,12 @@ public final class WebAsyncManager {
} }
}); });
} }
catch (RejectedExecutionException ex) {
Object result = interceptorChain.applyPostProcess(this.asyncWebRequest, callable, ex);
setConcurrentResultAndDispatch(result);
throw ex;
}
}
private void setConcurrentResultAndDispatch(Object result) { private void setConcurrentResultAndDispatch(Object result) {
synchronized (WebAsyncManager.this) { synchronized (WebAsyncManager.this) {