From 032ff5811fc8e2cc5478a78837b02acfccb89c14 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 19 Apr 2008 09:47:07 +0000 Subject: [PATCH] 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 --- java/org/apache/el/lang/ELSupport.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java index c638c6ddd..3b9fca96d 100644 --- 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); } -- 2.11.0