tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From billbar...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Sun, 25 Sep 2005 00:27:53 GMT
billbarker    2005/09/24 17:27:53

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  Fix problem of double-init when JMX-deploying a Context into a started Host.
  
  It doesn't seem possible to stop init being called twice in this scenario (at least with
the current JMX-deployment logic :), so let the second call do the actual work and make the
first call quit.
  
  Based on a patch submitted by:  Darran Lofthouse
  
  Fix for Bug #36802
  
  Revision  Changes    Path
  1.177     +5 -1      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java
  
  Index: StandardContext.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardContext.java,v
  retrieving revision 1.176
  retrieving revision 1.177
  diff -u -r1.176 -r1.177
  --- StandardContext.java	12 Sep 2005 00:19:38 -0000	1.176
  +++ StandardContext.java	25 Sep 2005 00:27:53 -0000	1.177
  @@ -5034,6 +5034,10 @@
                   destroy();
                   throw e;
               }
  +            // It's possible that addChild may have started us
  +            if( initialized ) {
  +                return;
  +            }
           }
           super.init();
           
  
  
  

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


Mime
View raw message