cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1520555 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
Date Fri, 06 Sep 2013 12:18:39 GMT
Author: sergeyb
Date: Fri Sep  6 12:18:38 2013
New Revision: 1520555

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

........
  r1520553 | sergeyb | 2013-09-06 13:04:58 +0100 (Fri, 06 Sep 2013) | 1 line
  
  Another attempt to bypass JAX-RS RuntimeDelegate
........

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/client/LocalClientState.java

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

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/client/LocalClientState.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java?rev=1520555&r1=1520554&r2=1520555&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/client/LocalClientState.java
Fri Sep  6 12:18:38 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;
     }
     



Mime
View raw message