Fix failed conversion in DoubleLocaleConverter when input is non-Double Number (1.X)

src/main/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverter.java

@@ -169,9 +169,9 @@ public DoubleLocaleConverter(final Object defaultValue, final Locale locale, fin
     @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());
     }
 }

src/test/java/org/apache/commons/beanutils/locale/converters/DoubleLocaleConverterTest.java

@@ -49,6 +49,19 @@ public void tearDown() {
         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
      *