Author: markt
Date: Sat May 3 03:28:51 2008
New Revision: 653038
URL: http://svn.apache.org/viewvc?rev=653038&view=rev
Log:
Add Remy's NPE fix to trunk.
Modified:
tomcat/trunk/java/org/apache/el/lang/ELSupport.java
Modified: tomcat/trunk/java/org/apache/el/lang/ELSupport.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/lang/ELSupport.java?rev=653038&r1=653037&r2=653038&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/lang/ELSupport.java (original)
+++ tomcat/trunk/java/org/apache/el/lang/ELSupport.java Sat May 3 03:28:51 2008
@@ -341,7 +341,7 @@
public final static Object coerceToType(final Object obj, final Class type)
throws IllegalArgumentException {
if (type == null || Object.class.equals(type) ||
- type.equals(obj.getClass())) {
+ (obj != null && type.equals(obj.getClass()))) {
return obj;
}
if (String.class.equals(type)) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
