cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core StandardContext.java

[remm]

remm        01/04/08 23:52:10

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Allows using JNDI ENC operations in the destroy() method of a servlet.
  
  Revision  Changes    Path
  1.51      +17 -4     
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.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- StandardContext.java      2001/04/06 23:42:04     1.50
  +++ StandardContext.java      2001/04/09 06:52:10     1.51
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.50 2001/04/06 23:42:04 remm Exp $
  - * $Revision: 1.50 $
  - * $Date: 2001/04/06 23:42:04 $
  + * $Header: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
 1.51 2001/04/09 06:52:10 remm Exp $
  + * $Revision: 1.51 $
  + * $Date: 2001/04/09 06:52:10 $
    *
    * ====================================================================
    *
  @@ -141,7 +141,7 @@
    *
    * @author Craig R. McClanahan
    * @author Remy Maucherat
  - * @version $Revision: 1.50 $ $Date: 2001/04/06 23:42:04 $
  + * @version $Revision: 1.51 $ $Date: 2001/04/09 06:52:10 $
    */
   
   public class StandardContext
  @@ -3327,10 +3327,23 @@
           filterStop();
           listenerStop();
   
  +        if (isUseNaming()) {
  +            try {
  +                ContextBindings.bindThread(this, this);
  +            } catch (NamingException e) {
  +                log(sm.getString("standardContext.namingInitFailed",
  +                                 getName()));
  +            }
  +        }
  +
           // Normal container shutdown processing
           if (debug >= 1)
               log("Processing standard container shutdown");
           super.stop();
  +
  +        if (isUseNaming()) {
  +            ContextBindings.unbindThread(this, this);
  +        }
   
           if (debug >= 1)
               log("Stopping complete");