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 Sat, 02 Aug 2003 17:42:59 GMT
remm        2003/08/02 10:42:59

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardContext.java
  Log:
  - Some steps of startup shouldn't be executed if the context startup has
    previously encountered errors.
  
  Revision  Changes    Path
  1.79      +9 -7      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.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- StandardContext.java	1 Aug 2003 06:14:40 -0000	1.78
  +++ StandardContext.java	2 Aug 2003 17:42:59 -0000	1.79
  @@ -3823,12 +3823,12 @@
               dependencyCheck = validator.validateApplication(getResources(),
                                                               this);
           } catch (IOException ioe) {
  +            log.error("Error in dependencyCheck", ioe);
               dependencyCheck = false;
           }
   
           if (!dependencyCheck) {
               // do not make application available if depency check fails
  -            log.error( "Error in dependencyCheck");
               ok = false;
           }
   
  @@ -3981,15 +3981,17 @@
           }
   
           // JMX registration
  -        registerJMX();
  +        if (ok) {
  +            registerJMX();
   
  -        // Notify our interested LifecycleListeners
  -        lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null);
  -        startTime=System.currentTimeMillis();
  +            // Notify our interested LifecycleListeners
  +            lifecycle.fireLifecycleEvent(AFTER_START_EVENT, null);
  +        }
   
  +        startTime=System.currentTimeMillis();
           
           // Send j2ee.state.running notification 
  -        if (this.getObjectName() != null) {
  +        if (ok && (this.getObjectName() != null)) {
               Notification notification = 
                   new Notification("j2ee.state.running", this.getObjectName(), 
                                   sequenceNumber++);
  
  
  

Mime
View raw message