Author: sletellier Date: 2011-03-30 18:45:03 +0200 (Wed, 30 Mar 2011) New Revision: 2097 Url: http://nuiton.org/repositories/revision/nuiton-utils/2097 Log: - Use set to prevent double property loading Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java Modified: trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java =================================================================== --- trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-03-30 15:00:07 UTC (rev 2096) +++ trunk/nuiton-utils/src/main/java/org/nuiton/util/ApplicationConfig.java 2011-03-30 16:45:03 UTC (rev 2097) @@ -26,7 +26,11 @@ package org.nuiton.util; -import static org.nuiton.i18n.I18n._; +import org.apache.commons.beanutils.ConstructorUtils; +import org.apache.commons.collections.EnumerationUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.converter.ConverterUtil; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -53,18 +57,16 @@ import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; +import java.util.HashSet; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; import java.util.Locale; import java.util.Map; import java.util.Properties; +import java.util.Set; -import org.apache.commons.beanutils.ConstructorUtils; -import org.apache.commons.collections.EnumerationUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.util.converter.ConverterUtil; +import static org.nuiton.i18n.I18n._; /** * Application configuration. @@ -1787,8 +1789,8 @@ // classpath String filename = getConfigFileName(); Enumeration<URL> enumInClasspath = ClassLoader.getSystemClassLoader().getResources(filename); - List<URL> urlsInClasspath = EnumerationUtils.toList(enumInClasspath); - + Set<URL> urlsInClasspath = new HashSet<URL>(EnumerationUtils.toList(enumInClasspath)); + enumInClasspath = ApplicationConfig.class.getClassLoader().getResources(filename); urlsInClasspath.addAll(EnumerationUtils.toList(enumInClasspath));