[mashup-dev] svn commit r17727 - trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system

[keith at wso2.com]

Author: keith
Date: Sun Jun  1 06:44:24 2008
New Revision: 17727
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=17727

Log:
Fixing mashup-821


Modified:
   trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java

Modified: trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java?rev=17727&r1=17726&r2=17727&view=diff
==============================================================================
--- trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java	(original)
+++ trunk/mashup/java/modules/hostobjects/src/org/wso2/mashup/hostobjects/system/SystemHostObject.java	Sun Jun  1 06:44:24 2008
@@ -227,10 +227,14 @@
         // (eg:http://localhost:7762/services/)
         URI baseURI;
         try {
+            String contextPath = AdminUIServletContextListener.contextPath;
+            if (!contextPath.endsWith(MashupConstants.FORWARD_SLASH)) {
+                contextPath += MashupConstants.FORWARD_SLASH;
+            }
             baseURI = new URI("http", null, NetworkUtils.getLocalHostname(),
                               ServerManager.getInstance().getHttpPort(),
-                              AdminUIServletContextListener.contextPath + "/" +
-                                      configurationContext.getServiceContextPath() + "/",
+                              contextPath +
+                                      configurationContext.getServicePath() + "/",
                               null, null);
         } catch (Exception e) {
             throw new MashupFault("Cannot create the server base URI.", e);