[OFBiz] SVN: r6538 - trunk/framework/common/src/org/ofbiz/common

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-01-22 19:47:50 -0600 (Sun, 22 Jan 2006)
New Revision: 6538

Modified:
   trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java
Log:
Fixed issue reported by Andrew Yager, slight variation on the proposed fix; Jira #OFBIZ-694

Modified: trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java
===================================================================
--- trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java	2006-01-23 00:56:54 UTC (rev 6537)
+++ trunk/framework/common/src/org/ofbiz/common/CommonWorkers.java	2006-01-23 01:47:50 UTC (rev 6538)
@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.Map;
 
+import javolution.util.FastList;
+
 import org.ofbiz.base.util.Debug;
 import org.ofbiz.base.util.UtilMisc;
 import org.ofbiz.base.util.UtilProperties;
@@ -52,7 +54,7 @@
     public final static String module = CommonWorkers.class.getName();
 
     public static List getCountryList(GenericDelegator delegator) {
-        List geoList = new ArrayList();
+        List geoList = FastList.newInstance();
         String defaultCountry = UtilProperties.getPropertyValue("general.properties", "country.geo.id.default");
         GenericValue defaultGeo = null;
         if (defaultCountry != null && defaultCountry.length() > 0) { 
@@ -62,16 +64,17 @@
                 Debug.logError(e, "Cannot lookup Geo", module);
             }       
         }        
-        Map findMap = UtilMisc.toMap("geoTypeId", "COUNTRY");
-        List sortList = UtilMisc.toList("geoName");
         try {
-            geoList = delegator.findByAndCache("Geo", findMap, sortList);
+        	List countryGeoList = delegator.findByAndCache("Geo", UtilMisc.toMap("geoTypeId", "COUNTRY"), UtilMisc.toList("geoName"));
+            if (defaultGeo != null) {
+                geoList.add(defaultGeo);
+            	geoList.addAll(countryGeoList);
+            } else {
+            	geoList = countryGeoList;
+            }
         } catch (GenericEntityException e) {
             Debug.logError(e, "Cannot lookup Geo", module);
         }        
-        if (defaultGeo != null) {
-            geoList.add(0, defaultGeo);
-        }        
         return geoList;            
     }