aboutsummaryrefslogtreecommitdiff
path: root/velocity-engine-core/src/main/java/org/apache/velocity/util
diff options
context:
space:
mode:
authorClaude Brisson <cbrisson@apache.org>2017-04-08 14:45:58 +0000
committerClaude Brisson <cbrisson@apache.org>2017-04-08 14:45:58 +0000
commit603a978b771c9f4be2e5af8ce9c0d29204e3f81b (patch)
tree822d1d18e2c8d80f6361bd59161c78f66ff572e3 /velocity-engine-core/src/main/java/org/apache/velocity/util
parenta0dc0be8334f9297bd15fc16a36d0189a588cc0c (diff)
downloadapache-velocity-engine-603a978b771c9f4be2e5af8ce9c0d29204e3f81b.tar.gz
[engine] Add forgotten conversion from Number to double
git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/trunk@1790688 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'velocity-engine-core/src/main/java/org/apache/velocity/util')
-rw-r--r--velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
index 70fc4c66..13275221 100644
--- a/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
+++ b/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
@@ -407,10 +407,12 @@ public class ConversionHandlerImpl implements ConversionHandler
standardConverterMap.put(new Pair<>(Double.class, Integer.class), toDouble);
standardConverterMap.put(new Pair<>(Double.class, Long.class), toDouble);
standardConverterMap.put(new Pair<>(Double.class, Float.class), toDouble);
+ standardConverterMap.put(new Pair<>(Double.class, Number.class), toDouble);
standardConverterMap.put(new Pair<>(Double.class, Short.TYPE), toDouble);
standardConverterMap.put(new Pair<>(Double.class, Integer.TYPE), toDouble);
standardConverterMap.put(new Pair<>(Double.class, Long.TYPE), toDouble);
standardConverterMap.put(new Pair<>(Double.class, Float.TYPE), toDouble);
+ standardConverterMap.put(new Pair<>(Double.TYPE, Number.class), toDouble);
/* string to double */
Converter<Double> stringToDouble = new Converter<Double>()