[jbossweb-commits] JBossWeb SVN: r2117 - branches/JBOSSWEB_2_0_0_GA_CP16_JBPAPP-10368/src/share/classes/org/apache/el/lang.
Author: aogburn
Date: 2012-11-07 17:53:07 -0500 (Wed, 07 Nov 2012)
New Revision: 2117
Modified:
branches/JBOSSWEB_2_0_0_GA_CP16_JBPAPP-10368/src/share/classes/org/apache/el/lang/ELSupport.java
Log:
[JBPAPP-10368] merge fix to JBWEB-198 from branch 2.1.x
Modified:
branches/JBOSSWEB_2_0_0_GA_CP16_JBPAPP-10368/src/share/classes/org/apache/el/lang/ELSupport.java
===================================================================
---
branches/JBOSSWEB_2_0_0_GA_CP16_JBPAPP-10368/src/share/classes/org/apache/el/lang/ELSupport.java 2012-11-07
22:29:00 UTC (rev 2116)
+++
branches/JBOSSWEB_2_0_0_GA_CP16_JBPAPP-10368/src/share/classes/org/apache/el/lang/ELSupport.java 2012-11-07
22:53:07 UTC (rev 2117)
@@ -246,6 +246,9 @@
if (Float.TYPE == type || Float.class.equals(type)) {
return new Float(number.floatValue());
}
+ if (Number.class.equals(type)) {
+ return number;
+ }
throw new IllegalArgumentException(MessageFactory.get("error.convert",
number, number.getClass(), type));
Property changes on:
branches/JBOSSWEB_2_0_0_GA_CP16_JBPAPP-10368/src/share/classes/org/apache/el/lang/ELSupport.java
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/2.1.x/java/org/apache/el/lang/ELSupport.java:1714