cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader StandardLoader.java

[remm]

remm        01/05/30 20:27:58

  Modified:    catalina/src/share/org/apache/catalina/loader
                        StandardLoader.java
  Log:
  - Remove useless thread binding / unbinding during the creation of the loader.
  
  Revision  Changes    Path
  1.25      +6 -12     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java
  
  Index: StandardLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- StandardLoader.java       2001/05/04 00:57:06     1.24
  +++ StandardLoader.java       2001/05/31 03:27:57     1.25
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
 1.24 2001/05/04 00:57:06 remm Exp $
  - * $Revision: 1.24 $
  - * $Date: 2001/05/04 00:57:06 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
 1.25 2001/05/31 03:27:57 remm Exp $
  + * $Revision: 1.25 $
  + * $Date: 2001/05/31 03:27:57 $
    *
    * ====================================================================
    *
  @@ -116,7 +116,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.24 $ $Date: 2001/05/04 00:57:06 $
  + * @version $Revision: 1.25 $ $Date: 2001/05/31 03:27:57 $
    */
   
   public final class StandardLoader
  @@ -600,10 +600,6 @@
               // Ignore the error here.
           }
   
  -        // Temporarily bind the current Catalina classloader to the directory
  -        // context
  -        DirContextURLStreamHandler.bind(this.container.getResources());
  -        
           // Configure our context repositories if appropriate
           setRepositories();
   
  @@ -625,7 +621,8 @@
                    if( contextURL != null ) {
                        ((StandardClassLoader)classLoader).setPermissions
                               (contextURL);
  -                        String jarUrl = "jar:" + contextURL.toString() + 
"WEB-INF/lib/";
  +                        String jarUrl = "jar:" + contextURL.toString() 
  +                            + "WEB-INF/lib/";
                           ((StandardClassLoader)classLoader).setPermissions
                               (jarUrl);                  
                       }
  @@ -648,9 +645,6 @@
        } catch (Throwable t) {
            throw new LifecycleException("start: ", t);
        }
  -
  -        // Unbind Catalina classloader
  -        DirContextURLStreamHandler.unbind();
   
           // Validate that all required packages are actually available
           validatePackages();