geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r514220 - /geronimo/server/trunk/modules/geronimo-web-2.5-builder/src/main/java/org/apache/geronimo/web25/deployment/AbstractWebModuleBuilder.java
Date Sat, 03 Mar 2007 19:09:57 GMT
Author: jgenender
Date: Sat Mar  3 11:09:56 2007
New Revision: 514220

URL: http://svn.apache.org/viewvc?view=rev&rev=514220
Log:
GERONIMO-2921 Forgot this file

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=514220&r1=514219&r2=514220
==============================================================================
--- 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
Sat Mar  3 11:09:56 2007
@@ -181,7 +181,10 @@
      * @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) {
-        contextRoot = "/" + contextRoot;
+        if (contextRoot == null)
+            contextRoot = "";
+        else
+            contextRoot = "/" + contextRoot;
         Map<String, String> map = new HashMap<String, String>();
         ServletMappingType[] servletMappings = webApp.getServletMappingArray();
         for (ServletMappingType servletMapping : servletMappings) {



Mime
View raw message