remm 02/02/13 16:45:30
Modified: catalina/src/share/org/apache/catalina/startup Tag:
tomcat_40_branch ClassLoaderFactory.java
Log:
- Port fix for validation.
- Fixes bug 6406.
Revision Changes Path
No revision
No revision
1.1.2.4 +4 -15
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.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- ClassLoaderFactory.java 25 Sep 2001 23:54:26 -0000 1.1.2.3
+++ ClassLoaderFactory.java 14 Feb 2002 00:45:30 -0000 1.1.2.4
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
1.1.2.3 2001/09/25 23:54:26 remm Exp $
- * $Revision: 1.1.2.3 $
- * $Date: 2001/09/25 23:54:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ClassLoaderFactory.java,v
1.1.2.4 2002/02/14 00:45:30 remm Exp $
+ * $Revision: 1.1.2.4 $
+ * $Date: 2002/02/14 00:45:30 $
*
* ====================================================================
*
@@ -92,7 +92,7 @@
* </ul>
*
* @author Craig R. McClanahan
- * @version $Revision: 1.1.2.3 $ $Date: 2001/09/25 23:54:26 $
+ * @version $Revision: 1.1.2.4 $ $Date: 2002/02/14 00:45:30 $
*/
public final class ClassLoaderFactory {
@@ -213,11 +213,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,
@@ -239,12 +234,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,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
