cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6744] Handling the exceptions escaped at initial suspend time
Date Wed, 13 Jan 2016 17:05:08 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.1.x-fixes 1fc285521 -> d91dce95c


[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/d91dce95
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d91dce95
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d91dce95

Branch: refs/heads/3.1.x-fixes
Commit: d91dce95ca6c19bdf54b4f1af18f603fa1f17dda
Parents: 1fc2855
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Jan 13 16:45:29 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Jan 13 17:04:54 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/d91dce95/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/d91dce95/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/";


Mime
View raw message