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 NamingContextListener.java
Date Fri, 17 May 2002 01:56:40 GMT
remm        02/05/16 18:56:40

  Modified:    catalina/src/share/org/apache/catalina/core
                        NamingContextListener.java
  Log:
  - Fix a bug where the listener would be registered on all lifecycle events (instead
    of just on start).
  
  Revision  Changes    Path
  1.14      +6 -5      jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java
  
  Index: NamingContextListener.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- NamingContextListener.java	8 May 2002 04:58:52 -0000	1.13
  +++ NamingContextListener.java	17 May 2002 01:56:40 -0000	1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
1.13 2002/05/08 04:58:52 remm Exp $
  - * $Revision: 1.13 $
  - * $Date: 2002/05/08 04:58:52 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/NamingContextListener.java,v
1.14 2002/05/17 01:56:40 remm Exp $
  + * $Revision: 1.14 $
  + * $Date: 2002/05/17 01:56:40 $
    *
    * ====================================================================
    *
  @@ -118,7 +118,7 @@
    * with each context and server.
    *
    * @author Remy Maucherat
  - * @version $Revision: 1.13 $ $Date: 2002/05/08 04:58:52 $
  + * @version $Revision: 1.14 $ $Date: 2002/05/17 01:56:40 $
    */
   
   public class NamingContextListener
  @@ -266,7 +266,6 @@
               namingResources = ((Context) container).getNamingResources();
           } else if (container instanceof Server) {
               namingResources = ((Server) container).getGlobalNamingResources();
  -            namingResources.addPropertyChangeListener(this);
           } else {
               return;
           }
  @@ -308,6 +307,7 @@
               }
   
               if (container instanceof Server) {
  +                namingResources.addPropertyChangeListener(this);
                   org.apache.naming.factory.ResourceLinkFactory.setGlobalContext
                       (namingContext);
                   try {
  @@ -873,6 +873,7 @@
               createSubcontexts(envCtx, resource.getName());
               envCtx.bind(resource.getName(), ref);
           } catch (NamingException e) {
  +            e.printStackTrace();
               log(sm.getString("naming.bindFailed", e));
           }
   
  
  
  

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