From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 17 Aug 2007 22:47:38 +0000 (+0000)
Subject: Fix NPE if no classpath is set
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=7e2fa51bac8fb464c049899eb79c7e816f646973;p=tomcat7.0

Fix NPE if no classpath is set


git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@567163 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/catalina/loader/VirtualWebappLoader.java b/java/org/apache/catalina/loader/VirtualWebappLoader.java
index 7b8661fb4..b218e50bd 100755
--- a/java/org/apache/catalina/loader/VirtualWebappLoader.java
+++ b/java/org/apache/catalina/loader/VirtualWebappLoader.java
@@ -82,11 +82,10 @@ public class VirtualWebappLoader extends WebappLoader {
 
     @Override
     public void start() throws LifecycleException {
-
         // just add any jar/directory set in virtual classpath to the
         // repositories list before calling start on the standard WebappLoader
         StringTokenizer tkn = new StringTokenizer(virtualClasspath, ";");
-        while (tkn.hasMoreTokens()) {
+        while (tkn!=null && tkn.hasMoreTokens()) {
             File file = new File(tkn.nextToken());
             if (!file.exists()) {
                 continue;