remm 01/11/13 16:10:44
Modified: catalina/src/share/org/apache/catalina/loader
WebappClassLoader.java
Log:
- Fix bug 4830.
Revision Changes Path
1.27 +9 -5
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.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- WebappClassLoader.java 2001/11/09 19:39:34 1.26
+++ WebappClassLoader.java 2001/11/14 00:10:44 1.27
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.26 2001/11/09 19:39:34 remm Exp $
- * $Revision: 1.26 $
- * $Date: 2001/11/09 19:39:34 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java,v
1.27 2001/11/14 00:10:44 remm Exp $
+ * $Revision: 1.27 $
+ * $Date: 2001/11/14 00:10:44 $
*
* ====================================================================
*
@@ -122,7 +122,7 @@
*
* @author Remy Maucherat
* @author Craig R. McClanahan
- * @version $Revision: 1.26 $ $Date: 2001/11/09 19:39:34 $
+ * @version $Revision: 1.27 $ $Date: 2001/11/14 00:10:44 $
*/
public class WebappClassLoader
extends URLClassLoader
@@ -1652,7 +1652,11 @@
String fullPath = repositories[i] + path;
- resource = (Resource) resources.lookup(fullPath);
+ Object lookupResult = resources.lookup(fullPath);
+ if (!(lookupResult instanceof Resource))
+ continue;
+
+ resource = (Resource) lookupResult;
// Note : Not getting an exception here means the resource was
// found
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
