This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch 1.X
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git
The following commit(s) were added to refs/heads/1.X by this push:
new 6b0e9585 Fix failed conversion in DoubleLocaleConverter when input is
non-Double Number (1.X) (#424)
6b0e9585 is described below
commit 6b0e958579d21ff39ebfbeff3955ecd45b1d3ea3
Author: Naveed Khan <[email protected]>
AuthorDate: Tue Jul 21 15:47:50 2026 +0000
Fix failed conversion in DoubleLocaleConverter when input is non-Double
Number (1.X) (#424)
Signed-off-by: Naveed Khan <[email protected]>
---
.../beanutils/locale/converters/DoubleLocaleConverter.java | 6 +++---
.../locale/converters/DoubleLocaleConverterTest.java | 13 +++++++++++++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git
a/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java
b/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java
index 30532cf3..01fb6136 100644
---
a/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java
+++
b/src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java
@@ -169,9 +169,9 @@ public class DoubleLocaleConverter extends
DecimalLocaleConverter {
@Override
protected Object parse(final Object value, final String pattern) throws
ParseException {
final Number result = (Number) super.parse(value, pattern);
- if (result instanceof Long) {
- return Double.valueOf(result.doubleValue());
+ if (result == null || result instanceof Double) {
+ return result;
}
- return result;
+ return Double.valueOf(result.doubleValue());
}
}
diff --git
a/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTest.java
b/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTest.java
index c52ba980..1c2e86cb 100644
---
a/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTest.java
+++
b/src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTest.java
@@ -49,6 +49,19 @@ public class DoubleLocaleConverterTest extends
BaseLocaleConverterTest {
super.tearDown();
}
+ /**
+ * Passing a non-Double Number directly (e.g. Integer) must return a
Double, not fail the conversion.
+ */
+ public void testConvertFromNonDoubleNumber() {
+
+ converter = new DoubleLocaleConverter();
+
+ assertEquals(Double.valueOf(42.0), converter.convert(Double.class,
Integer.valueOf(42), null));
+ assertEquals(Double.valueOf(3.14f), converter.convert(Double.class,
Float.valueOf(3.14f), null));
+ assertEquals(Double.valueOf(100L), converter.convert(Double.class,
Long.valueOf(100L), null));
+
+ }
+
/**
* Test Converter() constructor
*
