Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B1E11200B68 for ; Fri, 19 Aug 2016 18:30:21 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id B0522160AAB; Fri, 19 Aug 2016 16:30:21 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 075F0160A79 for ; Fri, 19 Aug 2016 18:30:20 +0200 (CEST) Received: (qmail 24286 invoked by uid 500); 19 Aug 2016 16:30:20 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 24273 invoked by uid 99); 19 Aug 2016 16:30:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 19 Aug 2016 16:30:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C8309E040F; Fri, 19 Aug 2016 16:30:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cxf git commit: [CXF-7000] Syncing how Jetty and Servlet3 continuation reset the properties on complete Date: Fri, 19 Aug 2016 16:30:19 +0000 (UTC) archived-at: Fri, 19 Aug 2016 16:30:21 -0000 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 Authored: Fri Aug 19 17:28:05 2016 +0100 Committer: Sergey Beryozkin 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) {