larryi 01/03/05 21:25:16
Modified: src/share/org/apache/tomcat/startup Main.java
Log:
Vector.contains() for vectors of URLs makes use of URL.equals(). Under
Jdk1.1, URL.equals() throws NPE's if host = null. Host = "" seems to work
better.
Revision Changes Path
1.30 +5 -5 jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java
Index: Main.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/startup/Main.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Main.java 2001/03/05 17:38:44 1.29
+++ Main.java 2001/03/06 05:25:14 1.30
@@ -1,4 +1,4 @@
-/* $Id: Main.java,v 1.29 2001/03/05 17:38:44 larryi Exp $
+/* $Id: Main.java,v 1.30 2001/03/06 05:25:14 larryi Exp $
* ====================================================================
*
* The Apache Software License, Version 1.1
@@ -107,7 +107,7 @@
@author Costin Manolache
@author Ignacio J. Ortega
@author Mel Martinez [EMAIL PROTECTED]
- @version $Revision: 1.29 $ $Date: 2001/03/05 17:38:44 $
+ @version $Revision: 1.30 $ $Date: 2001/03/06 05:25:14 $
*/
public class Main{
@@ -220,7 +220,7 @@
if( f.isDirectory() ){
path +="/";
}
- return new URL( "file", null, path );
+ return new URL( "file", "", path );
} catch (Exception ex) {
ex.printStackTrace();
return null;
@@ -281,7 +281,7 @@
for(int i=0; i < serverUrlV.size();i++){
serverJars.addElement(serverUrlV.elementAt(i));
}
- serverJars.addElement( new URL( "file", null ,
+ serverJars.addElement( new URL( "file", "" ,
System.getProperty( "java.home" ) + "/../lib/tools.jar"));
Vector commonDirJars = getClassPathV(getCommonDir());
@@ -392,7 +392,7 @@
if(f.isDirectory()){
path += "/";
}
- URL url = new URL("file",null,path);
+ URL url = new URL("file","",path);
if(!jars.contains(url)){
jars.addElement(url);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
