You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2015/04/29 08:29:29 UTC
svn commit: r1676675 - in /ofbiz/branches/release14.12: ./
framework/base/build.xml framework/base/src/org/ofbiz/base/util/UtilMisc.java
framework/base/src/org/ofbiz/base/util/test/UtilMiscTests.java
framework/base/testdef/basetests.xml
Author: adrianc
Date: Wed Apr 29 06:29:25 2015
New Revision: 1676675
URL: http://svn.apache.org/r1676675
Log:
Merged revision(s) 1676674 from ofbiz/trunk:
Fixed a bug in UtilMisc.java where the List returned by the availableLocales() method included an empty Locale - causing errors in FreeMarker templates.
https://issues.apache.org/jira/browse/OFBIZ-6309
Added:
ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/test/UtilMiscTests.java
- copied unchanged from r1676674, ofbiz/trunk/framework/base/src/org/ofbiz/base/util/test/UtilMiscTests.java
Modified:
ofbiz/branches/release14.12/ (props changed)
ofbiz/branches/release14.12/framework/base/build.xml
ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilMisc.java
ofbiz/branches/release14.12/framework/base/testdef/basetests.xml
Propchange: ofbiz/branches/release14.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 29 06:29:25 2015
@@ -8,4 +8,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908
+/ofbiz/trunk:1649072,1649083-1649084,1649086,1649090,1649096,1649230,1649238-1649239,1649248,1649272,1649275,1649280-1649281,1649283,1649285-1649286,1649291,1649329,1649331,1649384,1649393,1649666,1649742,1650240,1650348,1650357,1650583,1650642,1650678,1650821,1650882,1650887,1650938,1651593,1652312,1652361,1652638,1652641,1652672,1652688,1652706,1652725,1652731,1652739,1652852,1653248,1653296,1653456,1653597,1653614,1654175,1654273,1654509,1654670,1654672-1654673,1654683-1654684,1654824,1655046,1655668,1655979,1656014,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1659965,1660031,1660053,1660389,1660444,1660579,1661303,1661328,1661760,1661778,1661853,1661862,1661873,1661940,1661951,1661977,1662119-1662120,1662361,1662500,1662812,1662919,1663202,1663912,1663979,1664602,1664604,1664696,1665154,1665162,1665535,1666404,1666511,1666633,1666836,1666939,1666949,1666958,1667055,1667253,1667483,1667492,1667774,1668207,
1668214,1668236,1668246,1668258,1668263,1668265,1668270,1668277,1668314,1668657,1669317,1669588,1672427,1672430,1672846,1672853,1672856,1672862,1672873,1673764,1674447,1674464,1674491,1674496,1674908,1676674
Modified: ofbiz/branches/release14.12/framework/base/build.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/base/build.xml?rev=1676675&r1=1676674&r2=1676675&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/base/build.xml (original)
+++ ofbiz/branches/release14.12/framework/base/build.xml Wed Apr 29 06:29:25 2015
@@ -41,6 +41,7 @@ under the License.
<file name="org/ofbiz/base/lang/test/ComparableRangeTests.java"/>
<file name="org/ofbiz/base/util/test/IndentingWriterTests.java"/>
<file name="org/ofbiz/base/util/test/ObjectTypeTests.java"/>
+ <file name="org/ofbiz/base/util/test/UtilMiscTests.java"/>
<file name="org/ofbiz/base/util/test/UtilObjectTests.java"/>
<file name="org/ofbiz/base/util/string/test/FlexibleStringExpanderTests.java"/>
<file name="org/ofbiz/base/util/collections/test/FlexibleMapAccessorTests.java"/>
Modified: ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilMisc.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilMisc.java?rev=1676675&r1=1676674&r2=1676675&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilMisc.java (original)
+++ ofbiz/branches/release14.12/framework/base/src/org/ofbiz/base/util/UtilMisc.java Wed Apr 29 06:29:25 2015
@@ -746,7 +746,10 @@ public class UtilMisc {
} else {
Locale[] locales = Locale.getAvailableLocales();
for (int i = 0; i < locales.length && locales[i] != null; i++) {
- localeMap.put(locales[i].getDisplayName(), locales[i]);
+ String displayName = locales[i].getDisplayName();
+ if (!displayName.isEmpty()) {
+ localeMap.put(displayName, locales[i]);
+ }
}
}
return Collections.unmodifiableList(new ArrayList<Locale>(localeMap.values()));
Modified: ofbiz/branches/release14.12/framework/base/testdef/basetests.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/framework/base/testdef/basetests.xml?rev=1676675&r1=1676674&r2=1676675&view=diff
==============================================================================
--- ofbiz/branches/release14.12/framework/base/testdef/basetests.xml (original)
+++ ofbiz/branches/release14.12/framework/base/testdef/basetests.xml Wed Apr 29 06:29:25 2015
@@ -27,6 +27,7 @@
<junit-test-suite class-name="org.ofbiz.base.util.test.IndentingWriterTests"/>
<junit-test-suite class-name="org.ofbiz.base.util.test.ObjectTypeTests"/>
<!--junit-test-suite class-name="org.ofbiz.base.util.test.ReferenceCleanerTests"/-->
+ <junit-test-suite class-name="org.ofbiz.base.util.test.UtilMiscTests"/>
<junit-test-suite class-name="org.ofbiz.base.util.test.UtilObjectTests"/>
<junit-test-suite class-name="org.ofbiz.base.util.test.StringUtilTests"/>
<junit-test-suite class-name="org.ofbiz.base.util.test.UtilHttpTests"/>