cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1501812 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
Date Wed, 10 Jul 2013 15:56:56 GMT
Author: sergeyb
Date: Wed Jul 10 15:56:56 2013
New Revision: 1501812

URL: http://svn.apache.org/r1501812
Log:
Merged revisions 1501755 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1501755 | sergeyb | 2013-07-10 14:10:08 +0100 (Wed, 10 Jul 2013) | 1 line
  
  Releasing contexts if AsyncResponse is not immediately processed
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
    cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1501755

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java?rev=1501812&r1=1501811&r2=1501812&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java
Wed Jul 10 15:56:56 2013
@@ -195,6 +195,7 @@ public class JAXRSInvoker extends Abstra
             if (asyncResponse != null) {
                 if (!asyncResponse.isSuspended() && !asyncResponse.isResumedByApplication())
{
                     asyncResponse.suspendContinuation();
+                    providerFactory.clearThreadLocalProxies();
                 } else {
                     result = handleAsyncResponse(exchange, asyncResponse.getResponseObject());
                 }

Modified: cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java?rev=1501812&r1=1501811&r2=1501812&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
(original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/AbstractJAXRSContinuationsTest.java
Wed Jul 10 15:56:56 2013
@@ -58,6 +58,16 @@ public abstract class AbstractJAXRSConti
     }
     
     @Test
+    public void testImmediateResumeSubresource() throws Exception {
+        WebClient wc = WebClient.create("http://localhost:" + getPort() 
+                                        + "/bookstore/books/subresources/books/resume");
+        WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);
+        wc.accept("text/plain");
+        String str = wc.get(String.class);
+        assertEquals("immediateResume", str);
+    }
+    
+    @Test
     public void testTimeoutAndCancel() throws Exception {
         WebClient wc = WebClient.create("http://localhost:" + getPort() + "/bookstore/books/cancel");
         WebClient.getConfig(wc).getHttpConduit().getClient().setReceiveTimeout(1000000L);



Mime
View raw message