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 2013/09/06 14:04:58 UTC

svn commit: r1520553 - /cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java

Author: sergeyb
Date: Fri Sep  6 12:04:58 2013
New Revision: 1520553

URL: http://svn.apache.org/r1520553
Log:
Another attempt to bypass JAX-RS RuntimeDelegate

Modified:
    cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java

Modified: cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java?rev=1520553&r1=1520552&r2=1520553&view=diff
==============================================================================
--- cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java (original)
+++ cxf/trunk/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java Fri Sep  6 12:04:58 2013
@@ -26,6 +26,7 @@ import javax.ws.rs.core.UriBuilder;
 
 import org.apache.cxf.common.util.StringUtils;
 import org.apache.cxf.jaxrs.impl.MetadataMap;
+import org.apache.cxf.jaxrs.impl.UriBuilderImpl;
 
 /**
  * Keeps the client state such as the baseURI, currentURI, requestHeaders, current response
@@ -47,15 +48,15 @@ public class LocalClientState implements
     public LocalClientState(URI baseURI) {
         this.baseURI = baseURI;
         if (isHttpScheme(baseURI)) {
-            this.currentBuilder = UriBuilder.fromUri(baseURI);
+            this.currentBuilder = new UriBuilderImpl().uri(baseURI);
         } else {
-            this.currentBuilder = UriBuilder.fromUri("/");
+            this.currentBuilder = new UriBuilderImpl().uri("/");
         }
     }
     
     public LocalClientState(URI baseURI, URI currentURI) {
         this.baseURI = baseURI;
-        this.currentBuilder = UriBuilder.fromUri(currentURI);
+        this.currentBuilder = new UriBuilderImpl().uri(currentURI);
     }
     
     public LocalClientState(LocalClientState cs) {
@@ -118,7 +119,7 @@ public class LocalClientState implements
     public void reset() {
         requestHeaders.clear();
         response = null;
-        currentBuilder = UriBuilder.fromUri(baseURI);
+        currentBuilder = new UriBuilderImpl().uri(baseURI);
         templates = null;
     }