avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl DefaultServiceManager.java
Date Wed, 07 Jan 2004 14:50:17 GMT
mcconnell    2004/01/07 06:50:17

  Modified:    merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
                        Tag: Ver_3_4 DefaultServiceManager.java
  Log:
  Housekeeping.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.4.2.1   +12 -3     avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java
  
  Index: DefaultServiceManager.java
  ===================================================================
  RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultServiceManager.java,v
  retrieving revision 1.4
  retrieving revision 1.4.2.1
  diff -u -r1.4 -r1.4.2.1
  --- DefaultServiceManager.java	22 Oct 2003 01:45:37 -0000	1.4
  +++ DefaultServiceManager.java	7 Jan 2004 14:50:17 -0000	1.4.2.1
  @@ -99,8 +99,14 @@
        */
       public DefaultServiceManager( Logger logger, Map map )
       {
  -        if( logger == null ) throw new NullPointerException( "logger" );
  -        if( map == null ) throw new NullPointerException( "map" );
  +        if( logger == null ) 
  +        {
  +            throw new NullPointerException( "logger" );
  +        }
  +        if( map == null )
  +        {
  +            throw new NullPointerException( "map" );
  +        }
           super.enableLogging( logger );
           m_map = map;
       }
  @@ -148,7 +154,10 @@
               m_table.put( id, key );
               final String message = 
                 "resolved service [" + id + "] for the key [" + key + "].";
  -            getLogger().debug( message );
  +            if( getLogger().isDebugEnabled() )
  +            {
  +                getLogger().debug( message );
  +            }
               return object;
           }
           catch( Throwable e )
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message