Return-Path: 
 <tomcat-dev-return-5481-qmlist-jakarta-archive-tomcat-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org
Received: (qmail 65852 invoked from network); 13 Feb 2002 20:29:01 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 13 Feb 2002 20:29:01 -0000
Received: (qmail 13922 invoked by uid 97); 13 Feb 2002 20:28:46 -0000
Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org
Received: (qmail 13875 invoked by uid 97); 13 Feb 2002 20:28:46 -0000
Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:tomcat-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:tomcat-dev-help@jakarta.apache.org>
List-Post: <mailto:tomcat-dev@jakarta.apache.org>
List-Id: "Tomcat Developers List" <tomcat-dev.jakarta.apache.org>
Reply-To: "Tomcat Developers List" <tomcat-dev@jakarta.apache.org>
Delivered-To: mailing list tomcat-dev@jakarta.apache.org
Received: (qmail 13819 invoked by uid 97); 13 Feb 2002 20:28:45 -0000
Date: 13 Feb 2002 20:28:38 -0000
Message-ID: <20020213202838.25982.qmail@icarus.apache.org>
From: remm@apache.org
To: jakarta-tomcat-4.0-cvs@apache.org
Subject: cvs commit:
 jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup
 ClassLoaderFactory.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

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:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>