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

[remm]

remm        01/05/03 17:57:07

  Modified:    catalina/src/share/org/apache/catalina/loader
                        StandardLoader.java
  Log:
  - Bind the thread in charge of checking for a modified class.
  
  Revision  Changes    Path
  1.24      +11 -6     
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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- StandardLoader.java       2001/04/25 04:15:03     1.23
  +++ StandardLoader.java       2001/05/04 00:57:06     1.24
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/StandardLoader.java,v
 1.23 2001/04/25 04:15:03 glenn Exp $
  - * $Revision: 1.23 $
  - * $Date: 2001/04/25 04:15:03 $
  + * $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 $
    *
    * ====================================================================
    *
  @@ -116,7 +116,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.23 $ $Date: 2001/04/25 04:15:03 $
  + * @version $Revision: 1.24 $ $Date: 2001/05/04 00:57:06 $
    */
   
   public final class StandardLoader
  @@ -592,9 +592,10 @@
        started = true;
   
           // Register a stream handler factory for the JNDI protocol
  +        URLStreamHandlerFactory streamHandlerFactory = 
  +            new DirContextURLStreamHandlerFactory();
           try {
  -            URL.setURLStreamHandlerFactory
  -                (new DirContextURLStreamHandlerFactory());
  +            URL.setURLStreamHandlerFactory(streamHandlerFactory);
           } catch (Throwable t) {
               // Ignore the error here.
           }
  @@ -1283,6 +1284,8 @@
        if (debug >= 1)
            log("BACKGROUND THREAD Starting");
   
  +        DirContextURLStreamHandler.bindThread(this.container.getResources());
  +
        // Loop until the termination semaphore is set
        while (!threadDone) {
   
  @@ -1298,6 +1301,8 @@
            break;
   
        }
  +
  +        DirContextURLStreamHandler.unbindThread();
   
        if (debug >= 1)
            log("BACKGROUND THREAD Stopping");