remm 01/09/25 14:55:39
Modified: catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
Log:
- Fix a NPE when the class doesn't belong to a package.
Revision Changes Path
1.18 +6 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java
Index: WebappClassLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- WebappClassLoader.java 2001/09/24 22:09:29 1.17
+++ WebappClassLoader.java 2001/09/25 21:55:39 1.18
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.17 2001/09/24 22:09:29 remm Exp $
- * $Revision: 1.17 $
- * $Date: 2001/09/24 22:09:29 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.18 2001/09/25 21:55:39 remm Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/09/25 21:55:39 $
*
* ====================================================================
*
@@ -123,7 +123,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.17 $ $Date: 2001/09/24 22:09:29 $
+ * @version $Revision: 1.18 $ $Date: 2001/09/25 21:55:39 $
*/
public class WebappClassLoader
extends URLClassLoader
@@ -1762,6 +1762,8 @@
int pos = name.lastIndexOf('.');
if (pos != -1)
packageName = name.substring(0, pos);
+ else
+ return true;
if (packageName.equals("javax.servlet"))
return false;