From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 18 Apr 2008 18:10:06 +0000 (+0000)
Subject: Fix bug 43656. coerceToType() modified some values. Patch provided by Nils Eckert.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=51c9a7eec6679bb4065397f158a39c8e48ece796;p=tomcat7.0

Fix bug 43656. coerceToType() modified some values. Patch provided by Nils Eckert.

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

diff --git a/java/org/apache/el/lang/ELSupport.java b/java/org/apache/el/lang/ELSupport.java
index 18a53bc86..c638c6ddd 100644
--- a/java/org/apache/el/lang/ELSupport.java
+++ b/java/org/apache/el/lang/ELSupport.java
@@ -334,7 +334,8 @@ public class ELSupport {
 
     public final static Object coerceToType(final Object obj, final Class type)
             throws IllegalArgumentException {
-        if (type == null || Object.class.equals(type)) {
+        if (type == null || Object.class.equals(type) ||
+                type.equals(obj.getClass())) {
             return obj;
         }
         if (String.class.equals(type)) {