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-catalina/catalina/src/share/org/apache/catalina/core StandardContext.java
Date Wed, 26 Nov 2003 21:34:04 GMT
remm        2003/11/26 13:34:04

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Calculating the object name should occur as early as possible, to fix
    a stop/start scenario based on different object instances.
  - This fixes bug 25033.
  
  Revision  Changes    Path
  1.101     +7 -4      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.100
  retrieving revision 1.101
  diff -u -r1.100 -r1.101
  --- StandardContext.java	13 Nov 2003 21:03:14 -0000	1.100
  +++ StandardContext.java	26 Nov 2003 21:34:04 -0000	1.101
  @@ -3985,6 +3985,9 @@
   
           log.debug("Starting " + logName);
   
  +        // Set JMX object name for proper pipeline registration
  +        preRegisterJMX();
  +
           if ((oname != null) && 
               (Registry.getRegistry().getMBeanServer().isRegistered(oname))) {
               // As things depend on the JMX registration, the context
  @@ -4178,9 +4181,6 @@
                   if ((resources != null) && (resources instanceof Lifecycle))
                       ((Lifecycle) resources).start();
   
  -                // Set JMX object name for proper pipeline registration
  -                preRegisterJMX();
  -                
                   // Start our child containers, if any
                   Container children[] = findChildren();
                   for (int i = 0; i < children.length; i++) {
  @@ -5260,6 +5260,9 @@
       }
   
       private void registerJMX() {
  +        if (oname == null) {
  +            return;
  +        }
           try {
               if (log.isDebugEnabled()) {
                   log.debug("Checking for " + oname );
  
  
  

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