remm 2004/12/17 06:55:30
Modified: jasper2/src/share/org/apache/jasper/servlet
JasperLoader.java
Log:
- Override getResourceAsStream to prevent locking.
- Based on a patch submitted by Dominik Drzewiecki.
Revision Changes Path
1.17 +24 -2
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JasperLoader.java
Index: JasperLoader.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/servlet/JasperLoader.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- JasperLoader.java 22 Nov 2004 16:35:52 -0000 1.16
+++ JasperLoader.java 17 Dec 2004 14:55:30 -0000 1.17
@@ -16,6 +16,8 @@
package org.apache.jasper.servlet;
+import java.io.IOException;
+import java.io.InputStream;
import java.net.URL;
import java.net.URLClassLoader;
import java.security.AccessController;
@@ -27,8 +29,6 @@
import org.apache.jasper.Constants;
-import org.apache.jasper.security.SecurityUtil;
-
/**
* Class loader for loading servlet class files (corresponding to JSP files)
* and tag handler class files (corresponding to tag files).
@@ -158,6 +158,28 @@
return findClass(name);
}
+
+ /**
+ * Delegate to parent
+ *
+ * @see java.lang.ClassLoader#getResourceAsStream(java.lang.String)
+ */
+ public InputStream getResourceAsStream(String name) {
+ InputStream is = parent.getResourceAsStream(name);
+ if (is == null) {
+ URL url = findResource(name);
+ if (url != null) {
+ try {
+ is = url.openStream();
+ } catch (IOException e) {
+ is = null;
+ }
+ }
+ }
+ return is;
+ }
+
+
/**
* Get the Permissions for a CodeSource.
*
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
