You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/03/07 21:54:01 UTC
svn commit: r920110 -
/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Author: markt
Date: Sun Mar 7 20:54:01 2010
New Revision: 920110
URL: http://svn.apache.org/viewvc?rev=920110&view=rev
Log:
isELIgnored depends on library version and web.xml declaration
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Validator.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Validator.java?rev=920110&r1=920109&r2=920110&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Validator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Validator.java Sun Mar 7 20:54:01 2010
@@ -1077,12 +1077,15 @@
boolean deferred = false;
double libraryVersion = Double.parseDouble(
tagInfo.getTagLibrary().getRequiredVersion());
+ boolean elIgnored =
+ pageInfo.isELIgnored() ||
+ libraryVersion < 2.0;
boolean deferredSyntaxAllowedAsLiteral =
pageInfo.isDeferredSyntaxAllowedAsLiteral() ||
libraryVersion < 2.1;
ELNode.Nodes el = null;
- if (!runtimeExpression && !pageInfo.isELIgnored()) {
+ if (!runtimeExpression && !elIgnored) {
el = ELParser.parse(attrs.getValue(i),
deferredSyntaxAllowedAsLiteral);
Iterator<ELNode> nodes = el.iterator();
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org