Author: markt
Date: Tue May 5 12:39:31 2015
New Revision: 1677802
URL: http://svn.apache.org/r1677802
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=57802
Correct the default implementation of ELResolver.convertToType()
Modified:
tomcat/trunk/java/javax/el/ELResolver.java
tomcat/trunk/test/javax/el/TestELResolver.java
Modified: tomcat/trunk/java/javax/el/ELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/javax/el/ELResolver.java?rev=1677802&r1=1677801&r2=1677802&view=diff
==============================================================================
--- tomcat/trunk/java/javax/el/ELResolver.java (original)
+++ tomcat/trunk/java/javax/el/ELResolver.java Tue May 5 12:39:31 2015
@@ -136,6 +136,7 @@ public abstract class ELResolver {
* @since EL 3.0
*/
public Object convertToType(ELContext context, Object obj, Class<?> type) {
+ context.setPropertyResolved(false);
return null;
}
}
Modified: tomcat/trunk/test/javax/el/TestELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/javax/el/TestELResolver.java?rev=1677802&r1=1677801&r2=1677802&view=diff
==============================================================================
--- tomcat/trunk/test/javax/el/TestELResolver.java (original)
+++ tomcat/trunk/test/javax/el/TestELResolver.java Tue May 5 12:39:31 2015
@@ -127,4 +127,17 @@ public class TestELResolver {
Assert.assertEquals("3", result);
}
+
+ // https://bz.apache.org/bugzilla/show_bug.cgi?id=57802
+ @Test
+ public void testDefaultConvertToType() {
+ ELContext context = new TesterELContext(new StaticFieldELResolver());
+
+ ValueExpression ve =
ELManager.getExpressionFactory().createValueExpression(
+ context, "${!Boolean.FALSE}", Boolean.class);
+
+ Boolean result = (Boolean) ve.getValue(context);
+
+ Assert.assertEquals(Boolean.TRUE, result);
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
