Author: cbrisson
Date: Sat Apr 8 14:45:58 2017
New Revision: 1790688
URL: http://svn.apache.org/viewvc?rev=1790688&view=rev
Log:
[engine] Add forgotten conversion from Number to double
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp
Modified:
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java?rev=1790688&r1=1790687&r2=1790688&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/introspection/ConversionHandlerImpl.java
Sat Apr 8 14:45:58 2017
@@ -407,10 +407,12 @@ public class ConversionHandlerImpl imple
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>()
Modified:
velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp
URL:
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp?rev=1790688&r1=1790687&r2=1790688&view=diff
==============================================================================
---
velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp
(original)
+++
velocity/engine/trunk/velocity-engine-core/src/test/resources/conversion/compare/matrix.cmp
Sat Apr 8 14:45:58 2017
@@ -267,7 +267,7 @@
<td> <span class="implicit">implicit</span></td>
<td> <span class="implicit">implicit</span></td>
<td> <span class="implicit">implicit</span></td>
- <td> <span class="none">none</span></td>
+ <td> <span class="explicit">explicit</span></td>
<td> <span class="explicit">explicit</span></td>
<td> <span class="none">none</span></td>
<td><span class="none">none</span></td>
@@ -459,7 +459,7 @@
<td> <span class="explicit">explicit</span></td>
<td> <span class="explicit">explicit</span></td>
<td> <span class="strict">strict</span></td>
- <td> <span class="none">none</span></td>
+ <td> <span class="explicit">explicit</span></td>
<td> <span class="explicit">explicit</span></td>
<td> <span class="none">none</span></td>
<td> <span class="strict">strict</span></td>
