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

Provide method to set async TimeoutHandler 

Issue: SPR-9914
This commit is contained in:
Rossen Stoyanchev 2012-10-25 12:35:23 -04:00
parent b093b30315
commit cb86712187
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,6 +66,8 @@ public final class WebAsyncManager {
private AsyncTaskExecutor taskExecutor = new SimpleAsyncTaskExecutor(this.getClass().getSimpleName());
private Runnable timeoutHandler;
private Object concurrentResult = RESULT_NONE;
private Object[] concurrentResultContext;
@ -117,6 +119,15 @@ public final class WebAsyncManager {
this.taskExecutor = taskExecutor;
}
/**
* Set the handler to use when concurrent handling times out. If not set, by
* default a timeout is handled by returning SERVICE_UNAVAILABLE (503).
* @param timeoutHandler the handler
*/
public void setTimeoutHandler(Runnable timeoutHandler) {
this.timeoutHandler = timeoutHandler;
}
/**
* Whether the selected handler for the current request chose to handle the
* request asynchronously. A return value of "true" indicates concurrent
@ -348,6 +359,10 @@ public final class WebAsyncManager {
Assert.state(this.asyncWebRequest != null, "AsyncWebRequest must not be null");
this.asyncWebRequest.startAsync();
if (this.timeoutHandler != null) {
this.asyncWebRequest.setTimeoutHandler(this.timeoutHandler);
}
if (logger.isDebugEnabled()) {
HttpServletRequest request = asyncWebRequest.getNativeRequest(HttpServletRequest.class);
String requestUri = urlPathHelper.getRequestUri(request);

35
spring-web/src/test/java/org/springframework/web/context/request/async/WebAsyncManagerTests.java
View File

@ -91,11 +91,7 @@ public class WebAsyncManagerTests {
@Test
public void startCallableProcessing() throws Exception {
Callable<Object> task = new Callable<Object>() {
public Object call() throws Exception {
return 1;
}
};
Callable<Object> task = new StubCallable();
CallableProcessingInterceptor interceptor = createStrictMock(CallableProcessingInterceptor.class);
interceptor.preProcess(this.asyncWebRequest, task);
@ -146,11 +142,7 @@ public class WebAsyncManagerTests {
public void startCallableProcessingNullRequest() {
WebAsyncManager manager = WebAsyncUtils.getAsyncManager(new MockHttpServletRequest());
try {
manager.startCallableProcessing(new Callable<Object>() {
public Object call() throws Exception {
return 1;
}
});
manager.startCallableProcessing(new StubCallable());
fail("Expected exception");
}
catch (IllegalStateException ex) {
@ -191,6 +183,29 @@ public class WebAsyncManagerTests {
verify(this.asyncWebRequest, interceptor);
}
@Test
public void setTimeoutHandler() throws Exception {
Runnable timeoutHandler = new Runnable() { public void run() {} };
this.asyncManager.setTimeoutHandler(timeoutHandler);
this.asyncWebRequest.startAsync();
this.asyncWebRequest.setTimeoutHandler(timeoutHandler);
expect(this.asyncWebRequest.isAsyncComplete()).andReturn(false);
this.asyncWebRequest.dispatch();
replay(this.asyncWebRequest);
this.asyncManager.startCallableProcessing(new StubCallable());
verify(this.asyncWebRequest);
}
private final class StubCallable implements Callable<Object> {
public Object call() throws Exception {
return 1;
}
}
@SuppressWarnings("serial")
private static class SyncTaskExecutor extends SimpleAsyncTaskExecutor {