geronimo-scm mailing list archives

Author: djencks
Date: Fri Sep 30 17:08:58 2005
New Revision: 292881

URL: http://svn.apache.org/viewcvs?rev=292881&view=rev
Log:
GERONIMO-1031, avoid NPE when looking for context-root

Modified:
    geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=292881&r1=292880&r2=292881&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Fri Sep 30 17:08:58 2005
@@ -194,7 +194,11 @@
         }
 
         if (contextRoot == null) {
-            contextRoot = tomcatWebApp.getContextRoot();
+            if (tomcatWebApp.isSetContextRoot()) {
+                contextRoot = tomcatWebApp.getContextRoot();
+            } else {
+                contextRoot = determineDefaultContextRoot(webApp, standAlone, moduleFile,
targetPath);
+            }
         }
         //look for a webservices dd
         Map portMap = Collections.EMPTY_MAP;