avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mcconn...@apache.org
Subject cvs commit: avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder XMLProfileCreator.java
Date Mon, 30 Jun 2003 16:45:29 GMT
mcconnell    2003/06/30 09:45:29

  Modified:    merlin/meta/src/java/org/apache/avalon/meta/model/builder
                        XMLProfileCreator.java
  Log:
  Update implicit profile creation to correctly pull in the default configuration from the
type and only create a new configuration is the type supplied configuration is null.
  
  Revision  Changes    Path
  1.9       +6 -3      avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java
  
  Index: XMLProfileCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/model/builder/XMLProfileCreator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XMLProfileCreator.java	20 Jun 2003 05:25:27 -0000	1.8
  +++ XMLProfileCreator.java	30 Jun 2003 16:45:29 -0000	1.9
  @@ -359,8 +359,11 @@
       {
           ContextDirective contextDirective =
               new ContextDirective( null, new Import[ 0 ], new Entry[ 0 ] );
  -        final Configuration defaults =
  -            new DefaultConfiguration( "default", null );
  +        Configuration defaults = type.getConfiguration();
  +        if( defaults == null )
  +        {
  +            defaults = new DefaultConfiguration( "default", null );
  +        }
           final LoggingDirective categories =
               createDefaultLoggingDirective( type );
   
  
  
  

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


Mime
View raw message