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

MvcResult returns asyncResult after asyncDispatch

Browse Source 
Issue: SPR-16648
This commit is contained in:
Rossen Stoyanchev
2018-03-28 22:27:30 -04:00
parent 2e4963fca3
commit 6e4bbac6f7
5 changed files with 75 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-web/src/test/java/org/springframework/mock/web/test/MockAsyncContext.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -62,7 +62,14 @@ public class MockAsyncContext implements AsyncContext {
public void addDispatchHandler(Runnable handler) {
Assert.notNull(handler, "Dispatch handler must not be null");
this.dispatchHandlers.add(handler);
synchronized (this) {
if (this.dispatchedPath == null) {
this.dispatchHandlers.add(handler);
}
else {
handler.run();
}
}
}
@Override
@@ -92,9 +99,11 @@ public class MockAsyncContext implements AsyncContext {
@Override
public void dispatch(ServletContext context, String path) {
this.dispatchedPath = path;
for (Runnable r : this.dispatchHandlers) {
r.run();
synchronized (this) {
this.dispatchedPath = path;
for (Runnable r : this.dispatchHandlers) {
r.run();
}
}
}