Author: fhanik Date: Fri Aug 17 15:47:38 2007 New Revision: 567163 URL: http://svn.apache.org/viewvc?view=rev&rev=567163 Log: Fix NPE if no classpath is set
Modified: tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java Modified: tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java?view=diff&rev=567163&r1=567162&r2=567163 ============================================================================== --- tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/VirtualWebappLoader.java Fri Aug 17 15:47:38 2007 @@ -82,11 +82,10 @@ @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; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]