remm        02/02/26 18:56:18

  Modified:    catalina/src/share/org/apache/catalina/core Tag:
                        tomcat_40_branch StandardContext.java
  Log:
  - Post (most of) Craig's patch to fix bug 6594.
  - Add (very simple) lifecycle management to the dir context implementations.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.78.2.13 +23 -5     
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.78.2.12
  retrieving revision 1.78.2.13
  diff -u -r1.78.2.12 -r1.78.2.13
  --- StandardContext.java      20 Feb 2002 01:26:26 -0000      1.78.2.12
  +++ StandardContext.java      27 Feb 2002 02:56:18 -0000      1.78.2.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.78.2.12 2002/02/20 01:26:26 remm Exp $
  - * $Revision: 1.78.2.12 $
  - * $Date: 2002/02/20 01:26:26 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.78.2.13 2002/02/27 02:56:18 remm Exp $
  + * $Revision: 1.78.2.13 $
  + * $Date: 2002/02/27 02:56:18 $
    *
    * ====================================================================
    *
  @@ -98,9 +98,10 @@
   import org.apache.naming.ResourceRef;
   import org.apache.naming.ResourceEnvRef;
   import org.apache.naming.TransactionRef;
  +import org.apache.naming.resources.BaseDirContext;
   import org.apache.naming.resources.FileDirContext;
  +import org.apache.naming.resources.ProxyDirContext;
   import org.apache.naming.resources.WARDirContext;
  -import org.apache.naming.resources.BaseDirContext;
   import org.apache.naming.resources.DirContextURLStreamHandler;
   import org.apache.catalina.Container;
   import org.apache.catalina.ContainerListener;
  @@ -142,7 +143,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.78.2.12 $ $Date: 2002/02/20 01:26:26 $
  + * @version $Revision: 1.78.2.13 $ $Date: 2002/02/27 02:56:18 $
    */
   
   public class StandardContext
  @@ -3451,6 +3452,23 @@
               ContextBindings.unbindClassLoader(this, this);
               ContextAccessController.unsetSecurityToken
                   (getNamingContextName(), this);
  +        }
  +
  +        // Release our resources DirContext
  +        DirContext dirContext = getResources();
  +        if ((dirContext != null) &&
  +            (dirContext instanceof ProxyDirContext)) {
  +            dirContext = ((ProxyDirContext) dirContext).getDirContext();
  +        }
  +        if (dirContext != null) {
  +            if (debug >= 1) {
  +                log("Releasing document base " + docBase);
  +            }
  +            if (dirContext instanceof BaseDirContext) {
  +                ((BaseDirContext) dirContext).release();
  +            } else {
  +                log("Cannot release " + resources);
  +            }
           }
   
           // Normal container shutdown processing
  
  
  

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

Reply via email to