Changeset 905

Show
Ignore:
Timestamp:
10/17/06 19:49:09 (2 years ago)
Author:
alban
Message:

don't try to load user configuration when file doesn't exist

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/source/org/kolaka/freecast/config/DefaultConfigurationLoader.java

    r902 r905  
    3636import org.apache.commons.configuration.ConfigurationException; 
    3737import org.apache.commons.configuration.DefaultConfigurationBuilder; 
    38 import org.apache.commons.configuration.FileConfiguration; 
    3938import org.apache.commons.configuration.HierarchicalConfiguration; 
    4039import org.apache.commons.configuration.MapConfiguration; 
    …… 
    117116        "load the user configuration from " + userFile); 
    118117    XMLConfiguration configuration = new XMLConfiguration(userFile); 
    119     configuration.setRootElementName("freecast"); 
    120     try { 
    121       configuration.load(); 
    122     } catch (ConfigurationException e) { 
    123       LogFactory.getLog(getClass()).info("no user configuration found"); 
    124       LogFactory.getLog(getClass()).debug( 
    125           "can't load user configuration from " + userFile, e); 
     118     
     119    if (userFile.exists()) 
     120      try { 
     121        configuration.load(); 
     122      } catch (ConfigurationException e) { 
     123        LogFactory.getLog(getClass()).info("no user configuration found"); 
     124        LogFactory.getLog(getClass()).debug( 
     125            "can't load user configuration from " + userFile, e); 
     126      }  
     127    else { 
     128      configuration.setRootElementName("freecast"); 
    126129    } 
     130     
    127131    return configuration; 
    128132  }