tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amy...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup ContextConfig.java
Date Thu, 08 May 2003 22:41:36 GMT
amyroh      2003/05/08 15:41:36

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardPipeline.java
               catalina/src/share/org/apache/catalina/mbeans
                        MBeanFactory.java
               catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Register valve even if it's not an instance of Lifecycle.  It was not registering RequestDumperValve
before the fix.
  Also, lessen non severe error logs to info.
  
  Revision  Changes    Path
  1.10      +7 -6      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java
  
  Index: StandardPipeline.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardPipeline.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- StandardPipeline.java	25 Apr 2003 21:05:21 -0000	1.9
  +++ StandardPipeline.java	8 May 2003 22:41:35 -0000	1.10
  @@ -341,6 +341,7 @@
       }
   
       private void registerValve(Valve valve) {
  +
           if( valve instanceof ValveBase &&
                   ((ValveBase)valve).getObjectName()==null ) {
               try {
  @@ -474,7 +475,7 @@
        *  associated with a different Container
        */
       public void addValve(Valve valve) {
  -
  +    
           // Validate that we can add this Valve
           if (valve instanceof Contained)
               ((Contained) valve).setContainer(this.container);
  @@ -486,9 +487,9 @@
               } catch (LifecycleException e) {
                   log.error("StandardPipeline.addValve: start: ", e);
               }
  -            // Register the newly added valve
  -            registerValve(valve);
           }
  +        // Register the newly added valve
  +        registerValve(valve);
   
           // Add this Valve to the set associated with this Pipeline
           synchronized (valves) {
  
  
  
  1.15      +5 -10     jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java
  
  Index: MBeanFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/mbeans/MBeanFactory.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- MBeanFactory.java	3 May 2003 17:19:32 -0000	1.14
  +++ MBeanFactory.java	8 May 2003 22:41:35 -0000	1.15
  @@ -758,12 +758,7 @@
           ContainerBase containerBase = getParentContainerFromParent(pname);
           containerBase.addValve(valve);
           ObjectName oname = valve.getObjectName();
  -        if (oname != null) {
  -            return (oname.toString());
  -        } else {
  -            oname = MBeanUtils.createObjectName(pname.getDomain(), valve);
  -            return (oname.toString());
  -        }
  +        return (oname.toString());
   
       }
   
  
  
  
  1.24      +3 -3      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- ContextConfig.java	24 Apr 2003 21:13:11 -0000	1.23
  +++ ContextConfig.java	8 May 2003 22:41:35 -0000	1.24
  @@ -290,7 +290,7 @@
               stream = servletContext.getResourceAsStream
                   (Constants.ApplicationWebXml);
           if (stream == null) {
  -            log.error(sm.getString("contextConfig.applicationMissing") + " " + context);
  +            log.info(sm.getString("contextConfig.applicationMissing") + " " + context);
               return;
           }
           
  @@ -509,7 +509,7 @@
                   Pipeline pipeline = ((ContainerBase) context).getPipeline();
                   if (pipeline != null) {
                       ((ContainerBase) context).addValve(certificates);
  -                    log.error(sm.getString
  +                    log.info(sm.getString
                           ("contextConfig.certificatesConfig.added"));
                       
                   }
  
  
  

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