You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/07/12 19:11:46 UTC
svn commit: r1502618 - in /cxf/branches/2.7.x-fixes:
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: dkulp
Date: Fri Jul 12 17:11:46 2013
New Revision: 1502618
URL: http://svn.apache.org/r1502618
Log:
Merged revisions 1492755 via git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1492755 | sergeyb | 2013-06-13 12:54:16 -0400 (Thu, 13 Jun 2013) | 2 lines
Temporarily reverting r1492687
........
Modified:
cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
Modified: cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=1502618&r1=1502617&r2=1502618&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java (original)
+++ cxf/branches/2.7.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java Fri Jul 12 17:11:46 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/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java?rev=1502618&r1=1502617&r2=1502618&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java (original)
+++ cxf/branches/2.7.x-fixes/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java Fri Jul 12 17:11:46 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");