cxf-commits mailing list archives

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


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

Branch: refs/heads/3.0.x-fixes
Commit: 8bb8a5fe849190a08e3ea0b6dea42a48e456ba05
Parents: aac51e7
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:08:39 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/8bb8a5fe/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/8bb8a5fe/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