You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2016/01/13 17:45:43 UTC
cxf git commit: [CXF-6744] Handling the exceptions escaped at initial
suspend time
Repository: cxf
Updated Branches:
refs/heads/master 8f98be8e7 -> bc948f0ac
[CXF-6744] Handling the exceptions escaped at initial suspend time
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/bc948f0a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/bc948f0a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/bc948f0a
Branch: refs/heads/master
Commit: bc948f0acbbb1cd8f6ea960fd85f6e942a5db69b
Parents: 8f98be8
Author: Sergey Beryozkin <sb...@gmail.com>
Authored: Wed Jan 13 16:45:29 2016 +0000
Committer: Sergey Beryozkin <sb...@gmail.com>
Committed: Wed Jan 13 16:45:29 2016 +0000
----------------------------------------------------------------------
.../jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 2 +-
.../apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/bc948f0a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
----------------------------------------------------------------------
diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
index 086300d..ad2c627 100644
--- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
+++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
@@ -207,7 +207,7 @@ public class JAXRSInvoker extends AbstractInvoker {
}
} catch (Fault ex) {
Object faultResponse;
- if (asyncResponse != null && !asyncResponse.suspendContinuationIfNeeded()) {
+ if (asyncResponse != null) {
faultResponse = handleAsyncFault(exchange, asyncResponse, ex.getCause());
} else {
faultResponse = handleFault(ex, inMessage, cri, methodToInvoke);
http://git-wip-us.apache.org/repos/asf/cxf/blob/bc948f0a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java
----------------------------------------------------------------------
diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java
index 283a3e0..d1441a0 100644
--- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java
+++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSContinuationsServlet3Test.java
@@ -83,7 +83,6 @@ public class JAXRSContinuationsServlet3Test extends AbstractJAXRSContinuationsTe
assertString(cancel, AsyncResource.FALSE);
}
- @org.junit.Ignore
@Test
public void testLostThrowFromSuspendedCall() throws Exception {
String base = "http://localhost:" + getPort() + "/async/resource/";