Index: lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java =================================================================== diff -u -r1b582702563fd61b5689539f801828aaf3efcec2 -r4c8a9d0f03629b17fa043781d3eee47ffa88014e --- lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 1b582702563fd61b5689539f801828aaf3efcec2) +++ lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java (.../IntegrationService.java) (revision 4c8a9d0f03629b17fa043781d3eee47ffa88014e) @@ -33,6 +33,7 @@ import java.net.URLConnection; import java.net.URLEncoder; import java.text.ParseException; +import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -159,11 +160,13 @@ }else if(langIsoCode.trim().length()>0){ List list = service.findByProperty(SupportedLocale.class, "languageIsoCode", langIsoCode); if(list!=null && list.size()>0){ + Collections.sort(list); locale = (SupportedLocale)list.get(0); } }else if(countryIsoCode.trim().length()>0){ List list = service.findByProperty(SupportedLocale.class, "countryIsoCode", countryIsoCode); if(list!=null && list.size()>0){ + Collections.sort(list); locale = (SupportedLocale)list.get(0); } }