remm 02/02/13 12:28:38
Modified: catalina/src/share/org/apache/catalina/startup
ClassLoaderFactory.java
Log:
- Remove the repository validation from the base CL, as the delegation model
makes it useless.
- Fixes bug 6406.
Revision Changes Path
1.6 +4 -16
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java
Index: ClassLoaderFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ClassLoaderFactory.java 2 Nov 2001 20:34:48 -0000 1.5
+++ ClassLoaderFactory.java 13 Feb 2002 20:28:38 -0000 1.6
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
1.5 2001/11/02 20:34:48 craigmcc Exp $
- * $Revision: 1.5 $
- * $Date: 2001/11/02 20:34:48 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
1.6 2002/02/13 20:28:38 remm Exp $
+ * $Revision: 1.6 $
+ * $Date: 2002/02/13 20:28:38 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.5 $ $Date: 2001/11/02 20:34:48 $
+ * @version $Revision: 1.6 $ $Date: 2002/02/13 20:28:38 $
*/
public final class ClassLoaderFactory {
@@ -214,11 +214,6 @@
File file = unpacked[i];
if (!file.isDirectory() || !file.exists() || !file.canRead())
continue;
- if (!validateDirectory(file)) {
- if (debug >= 1)
- log(" Skipping directory " + file.getAbsolutePath());
- continue;
- }
if (debug >= 1)
log(" Including directory " + file.getAbsolutePath());
URL url = new URL("file", null,
@@ -240,12 +235,6 @@
if (!filename.endsWith(".jar"))
continue;
File file = new File(directory, filenames[j]);
- if (!validateJarFile(file)) {
- if (debug >= 1)
- log(" Skipping jar file " +
- file.getAbsolutePath());
- continue;
- }
if (debug >= 1)
log(" Including jar file " + file.getAbsolutePath());
URL url = new URL("file", null,
@@ -266,7 +255,6 @@
return (classLoader);
}
-
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
