Merge branch '6.1.x'
This commit is contained in:
commit
9f0417fb33
|
|
@ -388,16 +388,15 @@ public final class WebAsyncManager {
|
||||||
synchronized (WebAsyncManager.this) {
|
synchronized (WebAsyncManager.this) {
|
||||||
if (!this.state.compareAndSet(State.ASYNC_PROCESSING, State.RESULT_SET)) {
|
if (!this.state.compareAndSet(State.ASYNC_PROCESSING, State.RESULT_SET)) {
|
||||||
if (logger.isDebugEnabled()) {
|
if (logger.isDebugEnabled()) {
|
||||||
logger.debug("Async result already set: " +
|
logger.debug("Async result already set: [" + this.state.get() +
|
||||||
"[" + this.state.get() + "], ignored result: " + result +
|
"], ignored result for " + formatUri(this.asyncWebRequest));
|
||||||
" for " + formatUri(this.asyncWebRequest));
|
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.concurrentResult = result;
|
this.concurrentResult = result;
|
||||||
if (logger.isDebugEnabled()) {
|
if (logger.isDebugEnabled()) {
|
||||||
logger.debug("Async result set to: " + result + " for " + formatUri(this.asyncWebRequest));
|
logger.debug("Async result set for " + formatUri(this.asyncWebRequest));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.asyncWebRequest.isAsyncComplete()) {
|
if (this.asyncWebRequest.isAsyncComplete()) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue