Repository: cxf Updated Branches: refs/heads/3.1.x-fixes a0f196dcb -> b04eaeb49
[CXF-7000] Syncing how Jetty and Servlet3 continuation reset the properties on complete Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b04eaeb4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b04eaeb4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b04eaeb4 Branch: refs/heads/3.1.x-fixes Commit: b04eaeb4961564786d73dc02c3d0c1276810ae1b Parents: a0f196d Author: Sergey Beryozkin <[email protected]> Authored: Fri Aug 19 17:28:05 2016 +0100 Committer: Sergey Beryozkin <[email protected]> Committed: Fri Aug 19 17:30:06 2016 +0100 ---------------------------------------------------------------------- .../http_jetty/continuations/JettyContinuationWrapper.java | 4 ++-- .../apache/cxf/transport/http/Servlet3ContinuationProvider.java | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/b04eaeb4/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java ---------------------------------------------------------------------- diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java index 9664dee..3c83170 100644 --- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java +++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/continuations/JettyContinuationWrapper.java @@ -127,7 +127,7 @@ public class JettyContinuationWrapper implements Continuation, ContinuationListe getMessage().remove(AbstractHTTPDestination.CXF_CONTINUATION_MESSAGE); isPending = false; pendingTimeout = 0; - //REVISIT: isResumed = false; + isResumed = false; if (callback != null) { callback.onComplete(); } @@ -136,7 +136,7 @@ public class JettyContinuationWrapper implements Continuation, ContinuationListe public void onTimeout(org.eclipse.jetty.continuation.Continuation cont) { isPending = false; pendingTimeout = 0; - //isResumed = true; + isResumed = true; } } http://git-wip-us.apache.org/repos/asf/cxf/blob/b04eaeb4/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java ---------------------------------------------------------------------- diff --git a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java index 137dc45..b591070 100644 --- a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java +++ b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Servlet3ContinuationProvider.java @@ -185,6 +185,7 @@ public class Servlet3ContinuationProvider implements ContinuationProvider { } } isResumed = false; + isPending = false; } public void onError(AsyncEvent event) throws IOException { if (callback != null) {
