Author: markt
Date: Tue Apr 8 15:17:34 2008
New Revision: 646102
URL: http://svn.apache.org/viewvc?rev=646102&view=rev
Log:
Revert previous fix as it needs correcting.
Modified:
tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
Modified: tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java?rev=646102&r1=646101&r2=646102&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELArithmetic.java Tue Apr 8 15:17:34
2008
@@ -326,8 +326,8 @@
return (obj != null && isNumberType(obj.getClass()));
}
- public final static boolean isNumberType(final Class<?> type) {
- return (Number.class.isAssignableFrom(type));
+ 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);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
