svn commit: r1637064 - /ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java

[adrianc]

Author: adrianc
Date: Thu Nov  6 10:08:40 2014
New Revision: 1637064

URL: http://svn.apache.org/r1637064
Log:
Fixed UtilProperties.java bug caused by removal of Javolution - 
https://issues.apache.org/jira/browse/OFBIZ-5857.

Modified:
    ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java

Modified: ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java?rev=1637064&r1=1637063&r2=1637064&view=diff
==============================================================================
--- ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java 
(original)
+++ ofbiz/trunk/framework/base/src/org/ofbiz/base/util/UtilProperties.java Thu 
Nov  6 10:08:40 2014
@@ -34,6 +34,7 @@ import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.InvalidPropertiesFormatException;
 import java.util.Iterator;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Locale;
@@ -798,7 +799,7 @@ public class UtilProperties implements S
         if (defaultCandidateLocales == null) {
             synchronized (UtilProperties.class) {
                 if (defaultCandidateLocales == null) {
-                    defaultCandidateLocales = new HashSet<Locale>();
+                    defaultCandidateLocales = new LinkedHashSet<Locale>();
                     
defaultCandidateLocales.addAll(localeToCandidateList(Locale.getDefault()));
                     
defaultCandidateLocales.addAll(localeToCandidateList(getFallbackLocale()));
                     defaultCandidateLocales.add(Locale.ROOT);
@@ -822,7 +823,7 @@ public class UtilProperties implements S
         if (Locale.ROOT.equals(locale)) {
             return UtilMisc.toList(locale);
         }
-        Set<Locale> localeSet = new HashSet<Locale>();
+        Set<Locale> localeSet = new LinkedHashSet<Locale>();
         localeSet.addAll(localeToCandidateList(locale));
         localeSet.addAll(getDefaultCandidateLocales());
         List<Locale> localeList = new ArrayList<Locale>(localeSet);