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/startup ContextConfig.java
Date Thu, 08 Nov 2001 21:14:25 GMT
remm        01/11/08 13:14:25

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  - Cleanup the resource links when stopping a context.
  
  Revision  Changes    Path
  1.55      +16 -8     jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- ContextConfig.java	2001/10/17 00:44:02	1.54
  +++ ContextConfig.java	2001/11/08 21:14:25	1.55
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.54 2001/10/17 00:44:02 craigmcc Exp $
  - * $Revision: 1.54 $
  - * $Date: 2001/10/17 00:44:02 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
1.55 2001/11/08 21:14:25 remm Exp $
  + * $Revision: 1.55 $
  + * $Date: 2001/11/08 21:14:25 $
    *
    * ====================================================================
    *
  @@ -104,16 +104,17 @@
   import org.apache.catalina.Host;
   import org.apache.catalina.core.ContainerBase;
   import org.apache.catalina.core.StandardContext;
  -import org.apache.catalina.deploy.LoginConfig;
  -import org.apache.catalina.deploy.SecurityConstraint;
   import org.apache.catalina.deploy.ApplicationParameter;
   import org.apache.catalina.deploy.ContextEjb;
   import org.apache.catalina.deploy.ContextEnvironment;
  +import org.apache.catalina.deploy.ContextLocalEjb;
  +import org.apache.catalina.deploy.ContextResource;
  +import org.apache.catalina.deploy.ContextResourceLink;
   import org.apache.catalina.deploy.ErrorPage;
   import org.apache.catalina.deploy.FilterDef;
   import org.apache.catalina.deploy.FilterMap;
  -import org.apache.catalina.deploy.ContextLocalEjb;
  -import org.apache.catalina.deploy.ContextResource;
  +import org.apache.catalina.deploy.LoginConfig;
  +import org.apache.catalina.deploy.SecurityConstraint;
   import org.apache.catalina.loader.Extension;
   import org.apache.catalina.util.StringManager;
   import org.apache.catalina.valves.ValveBase;
  @@ -126,7 +127,7 @@
    * of that Context, and the associated defined servlets.
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.54 $ $Date: 2001/10/17 00:44:02 $
  + * @version $Revision: 1.55 $ $Date: 2001/11/08 21:14:25 $
    */
   
   public final class ContextConfig
  @@ -726,6 +727,13 @@
           String[] resourceEnvRefs = context.findResourceEnvRefs();
           for (i = 0; i < resourceEnvRefs.length; i++) {
               context.removeResourceEnvRef(resourceEnvRefs[i]);
  +        }
  +
  +        // Removing resource links
  +        ContextResourceLink[] contextResourceLinks = 
  +            context.findResourceLinks();
  +        for (i = 0; i < contextResourceLinks.length; i++) {
  +            context.removeResourceLink(contextResourceLinks[i].getName());
           }
   
           // Removing resources
  
  
  

--
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