[jbossws-commits] JBossWS SVN: r13655 - thirdparty/cxf/branches/cxf-2.2.6/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet.

Author: richard.opalka(a)jboss.com Date: 2011-01-31 11:06:24 -0500 (Mon, 31 Jan 2011) New Revision: 13655 Modified: thirdparty/cxf/branches/cxf-2.2.6/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java Log: [JBPAPP-4564][JBWS-3084] back porting CXF fix http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/o... Modified: thirdparty/cxf/branches/cxf-2.2.6/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java =================================================================== --- thirdparty/cxf/branches/cxf-2.2.6/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java 2011-01-31 15:37:34 UTC (rev 13654) +++ thirdparty/cxf/branches/cxf-2.2.6/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java 2011-01-31 16:06:24 UTC (rev 13655) @@ -99,7 +99,12 @@ } protected String getBasePath(String contextPath) throws IOException { - return contextPath + getAddress().getAddress().getValue(); + String address = getAddress().getAddress().getValue(); + if (address.startsWith("http")) { + return java.net.URI.create(address).getPath(); + } + + return contextPath + address; } @Override