tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Sat, 02 Feb 2002 17:51:30 GMT
remm        02/02/02 09:51:30

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Attempt to fix the (very complex) bug 5201.
  - Bind the CCL to the webapp ClassLoader during the start of the context's children
    and subcomponents.
  
  Revision  Changes    Path
  1.93      +16 -10    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.92
  retrieving revision 1.93
  diff -u -r1.92 -r1.93
  --- StandardContext.java	28 Jan 2002 12:08:22 -0000	1.92
  +++ StandardContext.java	2 Feb 2002 17:51:29 -0000	1.93
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.92 2002/01/28 12:08:22 remm Exp $
  - * $Revision: 1.92 $
  - * $Date: 2002/01/28 12:08:22 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
1.93 2002/02/02 17:51:29 remm Exp $
  + * $Revision: 1.93 $
  + * $Date: 2002/02/02 17:51:29 $
    *
    * ====================================================================
    *
  @@ -145,7 +145,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.92 $ $Date: 2002/01/28 12:08:22 $
  + * @version $Revision: 1.93 $ $Date: 2002/02/02 17:51:29 $
    */
   
   public class StandardContext
  @@ -3332,9 +3332,6 @@
               setManager(new StandardManager());
           }
   
  -        if (ok)
  -            DirContextURLStreamHandler.bind(getResources());
  -
           // Initialize character set mapper
           getCharsetMapper();
   
  @@ -3358,11 +3355,20 @@
               }
           }
   
  +        // Binding thread
  +        ClassLoader oldCCL = bindThread();
  +
           // Standard container startup
           if (debug >= 1)
               log("Processing standard container startup");
  -        if (ok)
  -            super.start();
  +        if (ok) {
  +            try {
  +                super.start();
  +            } finally {
  +                // Unbinding thread
  +                unbindThread(oldCCL);
  +            }
  +        }
           if (!getConfigured())
               ok = false;
   
  @@ -3372,7 +3378,7 @@
                   (Globals.RESOURCES_ATTR, getResources());
   
           // Binding thread
  -        ClassLoader oldCCL = bindThread();
  +        oldCCL = bindThread();
   
           // Configure and call application event listeners and filters
           if (ok) {
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message