From 68fe7530832f8d79cf1b26873af4f66202f9483c Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 11 Dec 2010 20:36:29 +0000 Subject: [PATCH] javax.el should not depend on javax.servlet.jsp.el git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1044708 13f79535-47bb-0310-9956-ffa450edef68 --- java/javax/el/CompositeELResolver.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/javax/el/CompositeELResolver.java b/java/javax/el/CompositeELResolver.java index 57f31b613..da3aada3f 100644 --- a/java/javax/el/CompositeELResolver.java +++ b/java/javax/el/CompositeELResolver.java @@ -21,8 +21,6 @@ import java.beans.FeatureDescriptor; import java.util.Iterator; import java.util.NoSuchElementException; -import javax.servlet.jsp.el.ScopedAttributeELResolver; - public class CompositeELResolver extends ELResolver { private int size; @@ -120,8 +118,10 @@ public class CompositeELResolver extends ELResolver { for (int i = 0; i < sz; i++) { type = this.resolvers[i].getType(context, base, property); if (context.isPropertyResolved()) { - if (resolvers[i] instanceof ScopedAttributeELResolver) { + if (resolvers[i].getClass().getName().equals( + "javax.servlet.jsp.el.ScopedAttributeELResolver")) { // Special case since this will always return Object.class + // for type Object value = resolvers[i].getValue(context, base, property); if (value != null) { -- 2.11.0