mcconnell    02/03/03 20:47:57

  Modified:    enterprise/tools/lib merlin.jar
               enterprise/tools/src/java/org/apache/avalon/excalibur/service
                        ServiceFactory.java
  Log:
  catagory enhancement
  
  Revision  Changes    Path
  1.5       +99 -103   jakarta-avalon-apps/enterprise/tools/lib/merlin.jar
  
        <<Binary file>>
  
  
  1.5       +3 -1      
jakarta-avalon-apps/enterprise/tools/src/java/org/apache/avalon/excalibur/service/ServiceFactory.java
  
  Index: ServiceFactory.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-apps/enterprise/tools/src/java/org/apache/avalon/excalibur/service/ServiceFactory.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ServiceFactory.java       4 Mar 2002 04:39:37 -0000       1.4
  +++ ServiceFactory.java       4 Mar 2002 04:47:57 -0000       1.5
  @@ -59,6 +59,7 @@
       private Hashtable m_transients = new Hashtable();
       private File m_root;
       private boolean m_verbose;
  +    private Logger m_base_logger;
   
       private Hashtable m_services = new Hashtable();
       private Hashtable m_lookup = new Hashtable();
  @@ -73,6 +74,7 @@
   
       public void enableLogging( Logger logger )
       {
  +        m_base_logger = logger;
           super.enableLogging( logger.getChildLogger( "factory" ) );
           m_registry.enableLogging( logger.getChildLogger("registry") );
       }
  @@ -249,7 +251,7 @@
           if( m_object instanceof LogEnabled ) try
           {
               if( m_verbose ) getLogger().debug( "applying logger to " + role 
);
  -            ((LogEnabled)m_object).enableLogging( 
getLogger().getChildLogger( role ) );
  +            ((LogEnabled)m_object).enableLogging( 
m_base_logger.getChildLogger( role ) );
           }
           catch( Throwable e )
           {
  
  
  

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

Reply via email to