[riftsaw-commits] riftsaw SVN: r1471 - branches/RiftSaw-2.3.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi.
Author: objectiser
Date: 2011-11-07 04:18:55 -0500 (Mon, 07 Nov 2011)
New Revision: 1471
Modified:
branches/RiftSaw-2.3.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/JBossURLLocalizer.java
Log:
SOA-3466 - apply Kurt's fix to URL rewrite.
Modified:
branches/RiftSaw-2.3.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/JBossURLLocalizer.java
===================================================================
---
branches/RiftSaw-2.3.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/JBossURLLocalizer.java 2011-11-04
15:47:26 UTC (rev 1470)
+++
branches/RiftSaw-2.3.x/runtime/uddi/src/main/java/org/jboss/soa/bpel/uddi/JBossURLLocalizer.java 2011-11-07
09:18:55 UTC (rev 1471)
@@ -54,7 +54,7 @@
* @return
*/
public String rewriteToWSDLURL(URL url) {
- return getWebserviceBaseUrl() + "/" + url.getPath() + "?wsdl";
+ return getWebserviceBaseUrl() + url.getPath() + "?wsdl";
}
/**
*
@@ -62,7 +62,7 @@
* @return
*/
public String rewrite(URL url) {
- return getWebserviceBaseUrl() + "/" + url.getPath();
+ return getWebserviceBaseUrl() + url.getPath();
}
/**
*
@@ -71,6 +71,7 @@
private String getWebserviceBaseUrl() {
String url = properties.getProperty(BPELEngineImpl.BPEL_WEBSERVICE_BASEURL);
if (url != null) {
+ if (!url.endsWith("/")) url = url + "/";
return url;
}
return getDefaultWebServiceBaseUrl();
@@ -86,7 +87,9 @@
int secureWebServicePort = serverConfig.getWebServicePort();
theURL = new URL("https://" + webServiceHost + ":" +
secureWebServicePort);
}
- return theURL.toExternalForm();
+ String url = theURL.toExternalForm();
+ if (!url.endsWith("/")) url = url + "/";
+ return url;
} catch (MalformedURLException e) {
log.error("Error in constructing the webservice base url.", e);
return null;