remm        01/07/24 21:05:50

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java StandardContextValve.java
                        StandardWrapper.java
  Log:
  - Cleanup of the thread binding.
  - Should now set up the context class loader during the start and stop of
    listeners and filters (bug 2755).
  
  Revision  Changes    Path
  1.71      +27 -33    
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- StandardContext.java      2001/07/24 22:51:43     1.70
  +++ StandardContext.java      2001/07/25 04:05:50     1.71
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.70 2001/07/24 22:51:43 remm Exp $
  - * $Revision: 1.70 $
  - * $Date: 2001/07/24 22:51:43 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.71 2001/07/25 04:05:50 remm Exp $
  + * $Revision: 1.71 $
  + * $Date: 2001/07/25 04:05:50 $
    *
    * ====================================================================
    *
  @@ -142,7 +142,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.70 $ $Date: 2001/07/24 22:51:43 $
  + * @version $Revision: 1.71 $ $Date: 2001/07/25 04:05:50 $
    */
   
   public class StandardContext
  @@ -2284,7 +2284,7 @@
           setPaused(true);
   
           // Binding thread
  -        bindThread();
  +        ClassLoader oldCCL = bindThread();
   
           // Shut down the current version of all active servlets
           Container children[] = findChildren();
  @@ -2301,11 +2301,6 @@
               }
           }
   
  -        // Unbinding thread
  -        if (isUseNaming()) {
  -            ContextBindings.unbindThread(this, this);
  -        }
  -
           // Clear all application-originated servlet context attributes
           if (context != null)
               context.clearAttributes();
  @@ -2324,7 +2319,7 @@
           }
   
           // Binding thread
  -        unbindThread();
  +        unbindThread(oldCCL);
   
           // Dump the old Jasper loader
           jasperLoader = null;
  @@ -2361,16 +2356,7 @@
           }
   
           // Binding thread
  -        bindThread();
  -
  -        ClassLoader oldCtxClassLoader =
  -            Thread.currentThread().getContextClassLoader();
  -        ClassLoader classLoader = loader.getClassLoader();
  -
  -        // Set the context class loader
  -        if (classLoader != null) {
  -            Thread.currentThread().setContextClassLoader(classLoader);
  -        }
  +        oldCCL = bindThread();
   
           // Restart our session manager (AFTER naming context recreated/bound)
           if ((manager != null) && (manager instanceof Lifecycle)) {
  @@ -2399,11 +2385,6 @@
           postResources();
           postWelcomeFiles();
   
  -        // Set the context class loader to the old class loader
  -        if (classLoader != null) {
  -            Thread.currentThread().setContextClassLoader(oldCtxClassLoader);
  -        }
  -
           // Restart our currently defined servlets
           for (int i = 0; i < children.length; i++) {
               if (!ok)
  @@ -2425,7 +2406,7 @@
           loadOnStartup(children);
   
           // Unbinding thread
  -        unbindThread();
  +        unbindThread(oldCCL);
   
           // Start accepting requests again
           if (ok) {
  @@ -3283,7 +3264,7 @@
               (Globals.RESOURCES_ATTR, getResources());
   
           // Binding thread
  -        bindThread();
  +        ClassLoader oldCCL = bindThread();
   
           // Configure and call application event listeners and filters
           if (ok) {
  @@ -3306,7 +3287,7 @@
           loadOnStartup(findChildren());
   
           // Unbinding thread
  -        unbindThread();
  +        unbindThread(oldCCL);
   
           if (ok) {
               if (debug >= 1)
  @@ -3334,7 +3315,7 @@
           setAvailable(false);
   
           // Binding thread
  -        bindThread();
  +        ClassLoader oldCCL = bindThread();
   
           // Stop our filters and application listeners
           filterStop();
  @@ -3356,7 +3337,7 @@
           super.stop();
   
           // Unbinding thread
  -        unbindThread();
  +        unbindThread(oldCCL);
   
           // Dump the old Jasper loader
           jasperLoader = null;
  @@ -3457,8 +3438,15 @@
       /**
        * Bind current thread, both for CL purposes and for JNDI ENC support
        * during : startup, shutdown and realoading of the context.
  +     * 
  +     * @return the previous context class loader
        */
  -    private void bindThread() {
  +    private ClassLoader bindThread() {
  +
  +        ClassLoader oldContextClassLoader = 
  +            Thread.currentThread().getContextClassLoader();
  +        Thread.currentThread().setContextClassLoader
  +            (getLoader().getClassLoader());
   
           DirContextURLStreamHandler.bind(getResources());
   
  @@ -3471,13 +3459,19 @@
               }
           }
   
  +        return oldContextClassLoader;
  +
       }
   
   
       /**
        * Unbind thread.
        */
  -    private void unbindThread() {
  +    private void unbindThread(ClassLoader oldContextClassLoader) {
  +
  +        Thread.currentThread().setContextClassLoader(oldContextClassLoader);
  +
  +        oldContextClassLoader = null;
   
           if (isUseNaming()) {
               ContextBindings.unbindThread(this, this);
  
  
  
  1.12      +5 -12     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java
  
  Index: StandardContextValve.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StandardContextValve.java 2001/07/22 20:25:08     1.11
  +++ StandardContextValve.java 2001/07/25 04:05:50     1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
 1.11 2001/07/22 20:25:08 pier Exp $
  - * $Revision: 1.11 $
  - * $Date: 2001/07/22 20:25:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContextValve.java,v
 1.12 2001/07/25 04:05:50 remm Exp $
  + * $Revision: 1.12 $
  + * $Date: 2001/07/25 04:05:50 $
    *
    * ====================================================================
    *
  @@ -93,7 +93,7 @@
    * when processing HTTP requests.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.11 $ $Date: 2001/07/22 20:25:08 $
  + * @version $Revision: 1.12 $ $Date: 2001/07/25 04:05:50 $
    */
   
   final class StandardContextValve
  @@ -212,14 +212,7 @@
           // Ask this Wrapper to process this Request
           response.setContext(context);
   
  -        // Bind current thread with the resources
  -        DirContextURLStreamHandler.bindThread(context.getResources());
  -
  -        try {
  -            wrapper.invoke(request, response);
  -        } finally {
  -            DirContextURLStreamHandler.unbindThread();
  -        }
  +        wrapper.invoke(request, response);
   
       }
   
  
  
  
  1.27      +4 -34     
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- StandardWrapper.java      2001/07/22 20:25:08     1.26
  +++ StandardWrapper.java      2001/07/25 04:05:50     1.27
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
 1.26 2001/07/22 20:25:08 pier Exp $
  - * $Revision: 1.26 $
  - * $Date: 2001/07/22 20:25:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
 1.27 2001/07/25 04:05:50 remm Exp $
  + * $Revision: 1.27 $
  + * $Date: 2001/07/25 04:05:50 $
    *
    * ====================================================================
    *
  @@ -105,7 +105,7 @@
    * make them efficient are counter-productive.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.26 $ $Date: 2001/07/22 20:25:08 $
  + * @version $Revision: 1.27 $ $Date: 2001/07/25 04:05:50 $
    */
   
   public final class StandardWrapper
  @@ -768,8 +768,6 @@
                   (sm.getString("standardWrapper.missingLoader", getName()));
           }
   
  -        ClassLoader oldCtxClassLoader =
  -            Thread.currentThread().getContextClassLoader();
           ClassLoader classLoader = loader.getClassLoader();
   
           // Special case class loader for a Catalina internal servlet
  @@ -785,11 +783,6 @@
               log(sm.getString("standardWrapper.jasperLoader", getName()));
           }
   
  -        // Set the context class loader
  -        if (classLoader != null) {
  -            Thread.currentThread().setContextClassLoader(classLoader);
  -        }
  -
           // Load the specified servlet class from the appropriate class loader
           Class classClass = null;
           try {
  @@ -800,21 +793,12 @@
               }
           } catch (ClassNotFoundException e) {
               unavailable(null);
  -            // Restore the context ClassLoader
  -            if (classLoader != null) {
  -                Thread.currentThread().setContextClassLoader
  -                    (oldCtxClassLoader);
  -            }
               throw new ServletException
                   (sm.getString("standardWrapper.missingClass", actualClass),
                    e);
           }
           if (classClass == null) {
               unavailable(null);
  -            if (classLoader != null) {
  -                Thread.currentThread().setContextClassLoader
  -                    (oldCtxClassLoader);
  -            }
               throw new ServletException
                   (sm.getString("standardWrapper.missingClass", actualClass));
           }
  @@ -826,19 +810,11 @@
           } catch (ClassCastException e) {
               unavailable(null);
               // Restore the context ClassLoader
  -            if (classLoader != null) {
  -                Thread.currentThread().setContextClassLoader
  -                    (oldCtxClassLoader);
  -            }
               throw new ServletException
                   (sm.getString("standardWrapper.notServlet", actualClass), e);
           } catch (Throwable e) {
               unavailable(null);
               // Restore the context ClassLoader
  -            if (classLoader != null) {
  -                Thread.currentThread().setContextClassLoader
  -                    (oldCtxClassLoader);
  -            }
               throw new ServletException
                   (sm.getString("standardWrapper.instantiate", actualClass), e);
           }
  @@ -875,12 +851,6 @@
               // said so, so do not call unavailable(null).
               throw new ServletException
                   (sm.getString("standardWrapper.initException", getName()), f);
  -        } finally {
  -            // Restore the context ClassLoader
  -            if (classLoader != null) {
  -                Thread.currentThread().setContextClassLoader
  -                    (oldCtxClassLoader);
  -            }
           }
   
           // Register our newly initialized instance
  
  
  

Reply via email to