remm        02/01/04 09:09:09

  Modified:    catalina/src/share/org/apache/catalina/loader
                        WebappLoader.java
  Log:
  - Make the notifier qn inner class, because of strange problems when using
    JDK 1.4. The code is simpler that way, but I don't undestand the failure I got
    (and why I don't get it with the inner class).
    The stack trace was (against rev 1.21 of WebappLoader):
  WebappClassLoader:   Resource '/WEB-INF/classes/HelloWorldExample.class' was 
modified; Date is now: Fri Jan 04 17:48:04
  CET 2002 Was: Fri Jan 04 14:48:08 CET 2002
  java.lang.NoClassDefFoundError: org/apache/catalina/loader/WebappContextNotifier
          at 
org.apache.catalina.loader.WebappLoader.notifyContext(WebappLoader.java:792)
          at org.apache.catalina.loader.WebappLoader.run(WebappLoader.java:1286)
          at java.lang.Thread.run(Thread.java:539)
  
  Revision  Changes    Path
  1.22      +17 -36    
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java
  
  Index: WebappLoader.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- WebappLoader.java 3 Jan 2002 16:31:06 -0000       1.21
  +++ WebappLoader.java 4 Jan 2002 17:09:08 -0000       1.22
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.21 2002/01/03 16:31:06 remm Exp $
  - * $Revision: 1.21 $
  - * $Date: 2002/01/03 16:31:06 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/loader/WebappLoader.java,v
 1.22 2002/01/04 17:09:08 remm Exp $
  + * $Revision: 1.22 $
  + * $Date: 2002/01/04 17:09:08 $
    *
    * ====================================================================
    *
  @@ -115,7 +115,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.21 $ $Date: 2002/01/03 16:31:06 $
  + * @version $Revision: 1.22 $ $Date: 2002/01/04 17:09:08 $
    */
   
   public class WebappLoader
  @@ -788,8 +788,7 @@
        */
       private void notifyContext() {
   
  -        WebappContextNotifier notifier =
  -            new WebappContextNotifier((Context) container);
  +        WebappContextNotifier notifier = new WebappContextNotifier();
           (new Thread(notifier)).start();
   
       }
  @@ -1294,47 +1293,29 @@
       }
   
   
  -}
  -
  -
  -// ------------------------------------------------------------ Private Classes
  -
  -
  -/**
  - * Private thread class to notify our associated Context that we have
  - * recognized the need for a reload.
  - */
  -
  -final class WebappContextNotifier implements Runnable {
  +    // -------------------------------------- WebappContextNotifier Inner Class
   
   
       /**
  -     * The Context we will notify.
  +     * Private thread class to notify our associated Context that we have
  +     * recognized the need for a reload.
        */
  -    private Context context = null;
  +    protected class WebappContextNotifier implements Runnable {
   
   
  -    /**
  -     * Construct a new instance of this class.
  -     *
  -     * @param context The Context to be notified
  -     */
  -    public WebappContextNotifier(Context context) {
  +        /**
  +         * Perform the requested notification.
  +         */
  +        public void run() {
   
  -        super();
  -        this.context = context;
  -
  -    }
  +            ((Context) container).reload();
   
  +        }
   
  -    /**
  -     * Perform the requested notification.
  -     */
  -    public void run() {
  -
  -        context.reload();
   
       }
   
   
   }
  +
  +
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to