tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1044708 - /tomcat/trunk/java/javax/el/CompositeELResolver.java
Date Sat, 11 Dec 2010 20:36:29 GMT
Author: markt
Date: Sat Dec 11 20:36:29 2010
New Revision: 1044708

URL: http://svn.apache.org/viewvc?rev=1044708&view=rev
Log:
javax.el should not depend on javax.servlet.jsp.el

Modified:
    tomcat/trunk/java/javax/el/CompositeELResolver.java

Modified: tomcat/trunk/java/javax/el/CompositeELResolver.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/CompositeELResolver.java?rev=1044708&r1=1044707&r2=1044708&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/CompositeELResolver.java (original)
+++ tomcat/trunk/java/javax/el/CompositeELResolver.java Sat Dec 11 20:36:29 2010
@@ -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
         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) {



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message