remm 2002/06/05 09:48:25
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContext.java
Log:
- GetResourcePaths used on a non existing path must return null (bug 9629).
- Patch submitted by Gidado-Yisa Immanuel <avm3 at cdc.gov>
Revision Changes Path
1.38 +5 -5
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java
Index: ApplicationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- ApplicationContext.java 26 Apr 2002 21:18:18 -0000 1.37
+++ ApplicationContext.java 5 Jun 2002 16:48:25 -0000 1.38
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.37 2002/04/26 21:18:18 remm Exp $
- * $Revision: 1.37 $
- * $Date: 2002/04/26 21:18:18 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.38 2002/06/05 16:48:25 remm Exp $
+ * $Revision: 1.38 $
+ * $Date: 2002/06/05 16:48:25 $
*
* ====================================================================
*
@@ -114,7 +114,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.37 $ $Date: 2002/04/26 21:18:18 $
+ * @version $Revision: 1.38 $ $Date: 2002/06/05 16:48:25 $
*/
public class ApplicationContext
@@ -717,7 +717,7 @@
try {
listCollectionPaths(set, resources, path);
} catch (NamingException e) {
- ; // Ignore
+ return (null);
}
set.setLocked(true);
return (set);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
