cvs commit: jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system ContainerManager.java

[bloritsch]

bloritsch    02/02/05 11:08:05

  Modified:    src/scratchpad/org/apache/avalon/excalibur/system
                        ContainerManager.java
  Log:
   make config file loading consistent
  
  Revision  Changes    Path
  1.15      +27 -13    
jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ContainerManager.java
  
  Index: ContainerManager.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-excalibur/src/scratchpad/org/apache/avalon/excalibur/system/ContainerManager.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- ContainerManager.java     5 Feb 2002 19:04:46 -0000       1.14
  +++ ContainerManager.java     5 Feb 2002 19:08:05 -0000       1.15
  @@ -116,7 +116,7 @@
    * </table>
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Berin Loritsch</a>
  - * @version CVS $Revision: 1.14 $ $Date: 2002/02/05 19:04:46 $
  + * @version CVS $Revision: 1.15 $ $Date: 2002/02/05 19:08:05 $
    */
   public class ContainerManager
   {
  @@ -463,18 +463,25 @@
           {
               String configFile = m_initialParameters.getParameter( 
CONTAINER_CONFIG, "" );
   
  -            try
  +            if ( "".equals( configFile.trim() ) )
               {
  -                m_containerConfig = m_configBuilder.buildFromFile( 
configFile );
  +                m_containerConfig = EMPTY_CONFIG;
               }
  -            catch (Exception e)
  +            else
               {
  -                if ( getLogger().isWarnEnabled() )
  +                try
                   {
  -                    getLogger().warn("Could not read configuration file: " + 
configFile, e);
  +                    m_containerConfig = m_configBuilder.buildFromFile( 
configFile );
                   }
  +                catch (Exception e)
  +                {
  +                    m_containerConfig = EMPTY_CONFIG;
   
  -                m_containerConfig = EMPTY_CONFIG;
  +                    if ( getLogger().isWarnEnabled() )
  +                    {
  +                        getLogger().warn("Could not read configuration file: 
" + configFile, e);
  +                    }
  +                }
               }
           }
   
  @@ -490,18 +497,25 @@
           {
               String configFile = m_initialParameters.getParameter( 
ROLE_CONFIG, "" );
   
  -            try
  +            if ( "".equals( configFile.trim() ) )
               {
  -                m_roleConfig = m_configBuilder.buildFromFile( configFile );
  +                m_roleConfig = EMPTY_CONFIG;
               }
  -            catch (Exception e)
  +            else
               {
  -                if ( getLogger().isWarnEnabled() )
  +                try
                   {
  -                    getLogger().warn("Could not read configuration file: " + 
configFile, e);
  +                    m_roleConfig = m_configBuilder.buildFromFile( configFile 
);
                   }
  +                catch (Exception e)
  +                {
  +                    m_roleConfig = EMPTY_CONFIG;
   
  -                m_roleConfig = EMPTY_CONFIG;
  +                    if ( getLogger().isWarnEnabled() )
  +                    {
  +                        getLogger().warn("Could not read configuration file: 
" + configFile, e);
  +                    }
  +                }
               }
           }
   
  
  
  

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