geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r551669 - /geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Date Thu, 28 Jun 2007 19:22:13 GMT
Author: gawor
Date: Thu Jun 28 12:22:13 2007
New Revision: 551669

URL: http://svn.apache.org/viewvc?view=rev&rev=551669
Log:
let's be a bit smarter about this. apparently double slashes can screw things up even for
tomcat

Modified:
    geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java

Modified: geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java?view=diff&rev=551669&r1=551668&r2=551669
==============================================================================
--- geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Thu Jun 28 12:22:13 2007
@@ -194,10 +194,11 @@
      * @return map of servlet names to path mapped to them.  Possibly inaccurate except for
web services.
      */
     protected Map<String, String> buildServletNameToPathMap(WebAppType webApp, String
contextRoot) {
-        if (contextRoot == null)
+        if (contextRoot == null) {
             contextRoot = "";
-        else
+        } else if (!contextRoot.startsWith("/")) {        
             contextRoot = "/" + contextRoot;
+        }
         Map<String, String> map = new HashMap<String, String>();
         ServletMappingType[] servletMappings = webApp.getServletMappingArray();
         for (ServletMappingType servletMapping : servletMappings) {



Mime
View raw message