remm 01/01/22 22:14:20
Modified: catalina/src/share/org/apache/catalina/core
ApplicationContext.java
Log:
- Should fix watchdog failure in /servlet-tests/GetResource_1Test.
A URL object was returned regardless of the existence of a resource at the
requested path.
Revision Changes Path
1.11 +13 -9
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApplicationContext.java 2001/01/23 05:05:46 1.10
+++ ApplicationContext.java 2001/01/23 06:14:20 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.10 2001/01/23 05:05:46 remm Exp $
- * $Revision: 1.10 $
- * $Date: 2001/01/23 05:05:46 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationContext.java,v
1.11 2001/01/23 06:14:20 remm Exp $
+ * $Revision: 1.11 $
+ * $Date: 2001/01/23 06:14:20 $
*
* ====================================================================
*
@@ -105,7 +105,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 1.10 $ $Date: 2001/01/23 05:05:46 $
+ * @version $Revision: 1.11 $ $Date: 2001/01/23 06:14:20 $
*/
public final class ApplicationContext
@@ -430,11 +430,15 @@
public URL getResource(String path) throws MalformedURLException {
DirContext resources = context.getResources();
- if (resources == null)
- return (null);
- else
- return new URL("jndi", null, 0, path,
- new DirContextURLStreamHandler(resources));
+ if (resources != null) {
+ try {
+ resources.lookup(path);
+ return new URL("jndi", null, 0, path,
+ new DirContextURLStreamHandler(resources));
+ } catch (Exception e) {
+ }
+ }
+ return (null);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, email: [EMAIL PROTECTED]
