costin      2003/03/18 23:32:48

  Modified:    catalina/src/share/org/apache/catalina/core
                        ContainerBase.java
  Log:
  Logger registration.
  Must be done in container since loggers don't implement lifecycle.
  
  Revision  Changes    Path
  1.10      +17 -2     
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java
  
  Index: ContainerBase.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/ContainerBase.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- ContainerBase.java        17 Mar 2003 06:50:21 -0000      1.9
  +++ ContainerBase.java        19 Mar 2003 07:32:48 -0000      1.10
  @@ -93,6 +93,8 @@
   import org.apache.catalina.Request;
   import org.apache.catalina.Response;
   import org.apache.catalina.Valve;
  +import org.apache.catalina.logger.LoggerBase;
  +import org.apache.catalina.session.StandardManager;
   import org.apache.catalina.valves.ValveBase;
   import org.apache.catalina.util.LifecycleSupport;
   import org.apache.catalina.util.StringManager;
  @@ -445,6 +447,7 @@
               }
           }
   
  +        
           // Start the new component if necessary
           if (logger != null)
               logger.setContainer(this);
  @@ -1195,7 +1198,19 @@
               log.info(sm.getString("containerBase.alreadyStarted", logName()));
               return;
           }
  -
  +        
  +        if( logger instanceof LoggerBase ) {
  +            LoggerBase lb=(LoggerBase)logger;
  +            if( lb.getObjectName()==null ) {
  +                ObjectName lname=lb.createObjectName();
  +                try {
  +                    Registry.getRegistry().registerComponent(lb, lname, null);
  +                } catch( Exception ex ) {
  +                    log.error( "Can't register logger " + lname, ex);
  +                }
  +            }
  +        }
  +        
           // Notify our interested LifecycleListeners
           lifecycle.fireLifecycleEvent(BEFORE_START_EVENT, null);
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to