Author: tchemit Date: 2012-06-12 11:02:54 +0200 (Tue, 12 Jun 2012) New Revision: 3448 Url: http://chorem.org/repositories/revision/pollen/3448 Log: fix default value loading in configuration Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-11 16:04:49 UTC (rev 3447) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-12 09:02:54 UTC (rev 3448) @@ -38,6 +38,7 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.Enumeration; import java.util.Properties; /** @@ -64,11 +65,19 @@ if (log.isInfoEnabled()) { log.info(this + " is initializing..."); } - applicationConfig = new ApplicationConfig(defaultOptions, file); - + applicationConfig = new ApplicationConfig(file); try { applicationConfig.loadDefaultOptions( PollenConfigurationOption.values()); + + if (defaultOptions != null) { + Enumeration<?> enumeration = defaultOptions.propertyNames(); + while (enumeration.hasMoreElements()) { + String key = (String) enumeration.nextElement(); + String property = defaultOptions.getProperty(key); + applicationConfig.setDefaultOption(key, property); + } + } applicationConfig.parse(); } catch (ArgumentsParserException e) { throw new PollenTechnicalException(