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/06/13 18:54:17 UTC
svn commit: r1492755 - in /cxf/trunk:
rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
Author: sergeyb
Date: Thu Jun 13 16:54:16 2013
New Revision: 1492755
URL: http://svn.apache.org/r1492755
Log:
Temporarily reverting r1492687
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=1492755&r1=1492754&r2=1492755&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Thu Jun 13 16:54:16 2013
@@ -93,11 +93,11 @@ public class ServletController {
// Using HTTP_PREFIX check is safe for ServletController
// URI.create(ad).isRelative() can be used - a bit more expensive though
if (ad != null && !ad.startsWith(HTTP_PREFIX)) {
- String endpointAddress = base + ad;
- request.setAttribute("org.apache.cxf.transport.endpoint.address",
- endpointAddress);
- if (!disableAddressUpdates) {
- BaseUrlHelper.setAddress(d, endpointAddress);
+ if (disableAddressUpdates) {
+ request.setAttribute("org.apache.cxf.transport.endpoint.address",
+ base + ad);
+ } else {
+ BaseUrlHelper.setAddress(d, base + ad);
}
}
}
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java?rev=1492755&r1=1492754&r2=1492755&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java Thu Jun 13 16:54:16 2013
@@ -61,7 +61,6 @@ public class JAXRSUriInfoTest extends Ab
*/
@Test
public void testBasePathAndPathAndPathParam() throws Exception {
- checkUriInfo("http://127.0.0.1:" + PORT + "/app/v1", "\"\"", "/");
checkUriInfo("http://localhost:" + PORT + "/app/v1", "\"\"", "/");
checkUriInfo("http://localhost:" + PORT + "/app/v1/", "\"\"", "/");
checkUriInfo("http://localhost:" + PORT + "/app/v1/test", "\"test\"", "test");