You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by az...@apache.org on 2006/09/04 14:54:29 UTC

svn commit: r440058 - in /webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2: context/ConfigurationContext.java transport/http/server/HttpUtils.java

Author: azeez
Date: Mon Sep  4 05:54:28 2006
New Revision: 440058

URL: http://svn.apache.org/viewvc?view=rev&rev=440058
Log:
Handle root context in ConfigurationContext


Modified:
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
    webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpUtils.java

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?view=diff&rev=440058&r1=440057&r2=440058
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java Mon Sep  4 05:54:28 2006
@@ -380,7 +380,11 @@
     }
 
     public String getServiceContextPath() {
-        String path =  getContextRoot().trim() + "/";
+        String ctxRoot = getContextRoot().trim();
+        String path = "/";
+        if(!ctxRoot.equals("/")){
+           path = ctxRoot + "/";
+        }
         if(servicePath == null || servicePath.trim().length() == 0){
             throw new IllegalArgumentException("service path cannot be null or empty");
         } else {

Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpUtils.java?view=diff&rev=440058&r1=440057&r2=440058
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpUtils.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/server/HttpUtils.java Mon Sep  4 05:54:28 2006
@@ -84,7 +84,7 @@
             }
         }
 
-        return address;
+        return address;                                                     
     }
 
     private static boolean isIP(String hostAddress) {



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org