From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 3 May 2008 10:28:51 +0000 (+0000)
Subject: Add Remy's NPE fix to trunk.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=8766bbdd463c5eb5d6f98f1614539a3bbc0bcaa2;p=tomcat7.0

Add Remy's NPE fix to trunk.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@653038 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java
index 3b9fca96d..5bddf4fc9 100644
--- a/java/org/apache/el/lang/ELSupport.java
+++ b/java/org/apache/el/lang/ELSupport.java
@@ -341,7 +341,7 @@ public class ELSupport {
     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)) {