avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From l...@apache.org
Subject cvs commit: jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util ContextBuilder.java ContextManager.java
Date Tue, 06 Aug 2002 00:52:25 GMT
leif        2002/08/05 17:52:25

  Modified:    fortress/src/java/org/apache/excalibur/fortress/util
                        ContextBuilder.java ContextManager.java
  Log:
  Commit patches by Christopher Kohlhaas.  Fix a typo setting the instrument
  manager and a linkage problem.
  
  Revision  Changes    Path
  1.19      +1 -1      jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java
  
  Index: ContextBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextBuilder.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- ContextBuilder.java	30 Jul 2002 16:57:42 -0000	1.18
  +++ ContextBuilder.java	6 Aug 2002 00:52:25 -0000	1.19
  @@ -209,7 +209,7 @@
   
       public void setInstrumentManager( InstrumentManager profiler )
       {
  -        context.put( INSTRUMENT_MANAGER_CONFIGURATION, profiler );
  +        context.put( INSTRUMENT_MANAGER, profiler );
           context.put( INSTRUMENT_MANAGER_CONFIGURATION, null );
           context.put( INSTRUMENT_MANAGER_CONFIGURATION_URI, null );
       }
  
  
  
  1.28      +10 -4     jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java
  
  Index: ContextManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-excalibur/fortress/src/java/org/apache/excalibur/fortress/util/ContextManager.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- ContextManager.java	5 Aug 2002 04:40:40 -0000	1.27
  +++ ContextManager.java	6 Aug 2002 00:52:25 -0000	1.28
  @@ -119,8 +119,10 @@
        */
       private final ArrayList ownedComponents = new ArrayList();
   
  -    private final DefaultConfigurationBuilder configBuilder =
  -        new DefaultConfigurationBuilder();
  +    /** The ConfigurationBuilder is instantiated lazilly in getConfiguration
  +     *   to avoid LinkageErrors in some environments. */
  +    private DefaultConfigurationBuilder configBuilder;
  +    
       private final DefaultConfigurationSerializer configSerializer =
           new DefaultConfigurationSerializer();
   
  @@ -548,7 +550,11 @@
           {
               resolver = (SourceResolver)manager.lookup( SourceResolver.ROLE );
               src = resolver.resolveURI( configUri );
  -
  +            if (configBuilder == null)
  +            {
  +                configBuilder = new DefaultConfigurationBuilder();
  +            }
  +            
               return configBuilder.build( src.getInputStream() );
           }
           catch( Exception e )
  
  
  

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


Mime
View raw message