From a38e8728d4d772bb09046446781e40237d7d8bfa Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 8 Apr 2008 21:25:04 +0000 Subject: [PATCH] This fixes 44766 but I can't see why the code was written as originally coded. Any light much appreciated. I'll give it a couple of days and then, assuming there are no objections, propose it for 6.0.x. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@646076 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/el/lang/ELArithmetic.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/org/apache/el/lang/ELArithmetic.java b/java/org/apache/el/lang/ELArithmetic.java index f78fea3a1..871605735 100644 --- a/java/org/apache/el/lang/ELArithmetic.java +++ b/java/org/apache/el/lang/ELArithmetic.java @@ -326,8 +326,8 @@ public abstract class ELArithmetic { return (obj != null && isNumberType(obj.getClass())); } - public final static boolean isNumberType(final Class type) { - return type == (java.lang.Long.class) || type == Long.TYPE || type == (java.lang.Double.class) || type == Double.TYPE || type == (java.lang.Byte.class) || type == Byte.TYPE || type == (java.lang.Short.class) || type == Short.TYPE || type == (java.lang.Integer.class) || type == Integer.TYPE || type == (java.lang.Float.class) || type == Float.TYPE || type == (java.math.BigInteger.class) || type == (java.math.BigDecimal.class); + public final static boolean isNumberType(final Class type) { + return (Number.class.isAssignableFrom(type)); } /** -- 2.11.0