(commons-beanutils) branch master updated: Fix ClassCastException in DoubleLocaleConverter when input is non-Double Number (#422)

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-beanutils.git


The following commit(s) were added to refs/heads/master by this push:
     new 068d1232 Fix ClassCastException in DoubleLocaleConverter when input is 
non-Double Number (#422)
068d1232 is described below

commit 068d12326d95d153b42b0f60d6dfb41a033fc27a
Author: Naveed Khan <164054284+rootvect...@users.noreply.github.com>
AuthorDate: Mon Jul 20 13:41:48 2026 +0000

    Fix ClassCastException in DoubleLocaleConverter when input is non-Double 
Number (#422)
---
 .../beanutils2/locale/converters/DoubleLocaleConverter.java |  6 +++---
 .../beanutils2/converters/DoubleLocaleConverterTest.java    | 13 +++++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
 
b/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
index c0ec0994..bec57800 100644
--- 
a/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
+++ 
b/src/main/java/org/apache/commons/beanutils2/locale/converters/DoubleLocaleConverter.java
@@ -71,9 +71,9 @@ public class DoubleLocaleConverter extends 
DecimalLocaleConverter<Double> {
     @Override
     protected Double parse(final Object value, final String pattern) throws 
ParseException {
         final Number result = super.parse(value, pattern);
-        if (result instanceof Long) {
-            return Double.valueOf(result.doubleValue());
+        if (result == null || result instanceof Double) {
+            return (Double) result;
         }
-        return (Double) result;
+        return Double.valueOf(result.doubleValue());
     }
 }
diff --git 
a/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTest.java
 
b/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTest.java
index 0fd961e2..4e8daf1d 100644
--- 
a/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTest.java
+++ 
b/src/test/java/org/apache/commons/beanutils2/converters/DoubleLocaleConverterTest.java
@@ -17,6 +17,8 @@
 
 package org.apache.commons.beanutils2.converters;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import org.apache.commons.beanutils2.locale.converters.DoubleLocaleConverter;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -37,6 +39,17 @@ class DoubleLocaleConverterTest extends 
AbstractLocaleConverterTest<Double> {
         expectedValue = Double.valueOf(expectedDecimalValue);
     }
 
+    /**
+     * Passing a non-Double Number directly (e.g. Integer) must return a 
Double, not throw ClassCastException.
+     */
+    @Test
+    void testConvertFromNonDoubleNumber() {
+        final DoubleLocaleConverter c = DoubleLocaleConverter.builder().get();
+        assertEquals(Double.valueOf(42.0), c.convert(Double.class, 
Integer.valueOf(42), null));
+        assertEquals(Double.valueOf(3.14f), c.convert(Double.class, 
Float.valueOf(3.14f), null));
+        assertEquals(Double.valueOf(100L), c.convert(Double.class, 
Long.valueOf(100L), null));
+    }
+
     /**
      * Test Converter() constructor Uses the default locale, no default value
      */