You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by sa...@apache.org on 2012/04/23 09:00:45 UTC
svn commit: r1329096 - in /axis/axis2/java/core/branches/1_6: ./
modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java
Author: sagara
Date: Mon Apr 23 07:00:45 2012
New Revision: 1329096
URL: http://svn.apache.org/viewvc?rev=1329096&view=rev
Log:
Merged r1329084 to the 1.6 branch.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/trunk:r1329084
Modified: axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java?rev=1329096&r1=1329095&r2=1329096&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java (original)
+++ axis/axis2/java/core/branches/1_6/modules/jaxws/src/org/apache/axis2/jaxws/addressing/factory/impl/Axis2EndpointReferenceFactoryImpl.java Mon Apr 23 07:00:45 2012
@@ -126,6 +126,11 @@ public class Axis2EndpointReferenceFacto
// just to keep it clean:
if (axis2EPR.getAddress().endsWith("/") && wsdlDocumentLocation.startsWith("/")) {
wsdlDocumentLocation = axis2EPR.getAddress() + wsdlDocumentLocation.substring(1);
+
+ } else if (axis2EPR.getAddress().endsWith("/")){
+ String eprAddress = axis2EPR.getAddress();
+ wsdlDocumentLocation = eprAddress.substring(0, eprAddress.length() - 1) + wsdlDocumentLocation;
+
} else {
wsdlDocumentLocation = axis2EPR.getAddress() + wsdlDocumentLocation;
}