Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 11487 invoked from network); 1 Oct 2005 00:08:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 Oct 2005 00:08:59 -0000 Received: (qmail 32257 invoked by uid 500); 1 Oct 2005 00:08:59 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 32247 invoked by uid 500); 1 Oct 2005 00:08:59 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 32236 invoked by uid 99); 1 Oct 2005 00:08:58 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 30 Sep 2005 17:08:58 -0700 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Fri, 30 Sep 2005 17:09:04 -0700 Received: (qmail 11435 invoked by uid 65534); 1 Oct 2005 00:08:38 -0000 Message-ID: <20051001000838.11434.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r292880 - /geronimo/branches/1.0-M5/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Date: Sat, 01 Oct 2005 00:08:37 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: djencks Date: Fri Sep 30 17:08:35 2005 New Revision: 292880 URL: http://svn.apache.org/viewcvs?rev=292880&view=rev Log: GERONIMO-1031, avoid NPE when looking for context-root Modified: geronimo/branches/1.0-M5/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Modified: geronimo/branches/1.0-M5/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0-M5/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=292880&r1=292879&r2=292880&view=diff ============================================================================== --- geronimo/branches/1.0-M5/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original) +++ geronimo/branches/1.0-M5/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Fri Sep 30 17:08:35 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;