More fixes for bug 43656 so new test case passes.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@649784 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java
index c638c6d..3b9fca9 100644 (file)
--- a/java/org/apache/el/lang/ELSupport.java
+++ b/java/org/apache/el/lang/ELSupport.java
@@ -223,9 +223,15 @@ public class ELSupport {
             if (number instanceof BigDecimal) {
                 return ((BigDecimal) number).toBigInteger();
             }
+            if (number instanceof BigInteger) {
+                return new BigInteger(number.toString());
+            }
             return BigInteger.valueOf(number.longValue());
         }
         if (BigDecimal.class.equals(type)) {
+            if (number instanceof BigDecimal) {
+                return new BigDecimal(number.toString());
+            }
             if (number instanceof BigInteger) {
                 return new BigDecimal((BigInteger) number);
             }