cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1423133 - /cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Date Mon, 17 Dec 2012 20:43:52 GMT
Author: dkulp
Date: Mon Dec 17 20:43:52 2012
New Revision: 1423133

URL: http://svn.apache.org/viewvc?rev=1423133&view=rev
Log:
Merged revisions 1423129 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1423129 | dkulp | 2012-12-17 15:38:32 -0500 (Mon, 17 Dec 2012) | 2 lines

  If the responsecode has already arrived, don't wait.

........

Modified:
    cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java

Modified: cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java?rev=1423133&r1=1423132&r2=1423133&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
(original)
+++ cxf/branches/2.6.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
Mon Dec 17 20:43:52 2012
@@ -503,10 +503,14 @@ public abstract class AbstractClient imp
     
     protected void waitForResponseCode(Exchange exchange) {
         synchronized (exchange) {
-            try {
-                exchange.wait(cfg.getSynchronousTimeout());
-            } catch (InterruptedException ex) {
-                // ignore
+            if (getResponseCode(exchange) == null) { 
+                try {
+                    exchange.wait(cfg.getSynchronousTimeout());
+                } catch (InterruptedException ex) {
+                    // ignore
+                }
+            } else {
+                return;
             }
         }
         



Mime
View raw message