diff --git a/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java index f84c3477..13c7e322 100755 --- a/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java +++ b/common/common-lang/src/main/java/com/twelvemonkeys/util/convert/NumberConverter.java @@ -91,7 +91,6 @@ public class NumberConverter implements PropertyConverter { if (pFormat == null) { // Use system default format, using default locale -// format = NumberFormat.getNumberInstance(); format = sDefaultFormat; } else { @@ -160,7 +159,6 @@ public class NumberConverter implements PropertyConverter { try { // Convert to string, default way if (StringUtil.isEmpty(pFormat)) { -// return NumberFormat.getNumberInstance().format(pObject); return sDefaultFormat.format(pObject); } @@ -196,13 +194,11 @@ public class NumberConverter implements PropertyConverter { return null; } - // ...and store in cache sFormats.put(key, format); } return format; } - } } diff --git a/common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java b/common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java index f66223ab..2b567ed6 100755 --- a/common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java +++ b/common/common-lang/src/test/java/com/twelvemonkeys/lang/BeanUtilTestCase.java @@ -3,10 +3,9 @@ package com.twelvemonkeys.lang; import junit.framework.TestCase; import java.io.Serializable; -import java.util.Map; -import java.util.HashMap; import java.lang.reflect.InvocationTargetException; -import java.text.NumberFormat; +import java.util.HashMap; +import java.util.Map; /** * BeanUtilTestCase @@ -95,7 +94,7 @@ public class BeanUtilTestCase extends TestCase { map.put("stringValue", 1); map.put("intValue", "2"); - map.put("doubleValue", NumberFormat.getNumberInstance().format(0.3)); // Note, format is locale specific... + map.put("doubleValue", ".3"); try { BeanUtil.configure(bean, map); @@ -106,7 +105,7 @@ public class BeanUtilTestCase extends TestCase { assertEquals("1", bean.getStringValue()); assertEquals(2, bean.getIntValue()); - assertEquals(.3, bean.getDoubleValue()); + assertEquals(0.3, bean.getDoubleValue()); } public void testConfigureAmbigious1() {