Author: lukaszlenart
Date: Fri Jul 12 07:09:42 2013
New Revision: 1502446
URL: http://svn.apache.org/r1502446
Log:
WW-4124 Improves loop
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java
Modified:
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java?rev=1502446&r1=1502445&r2=1502446&view=diff
==============================================================================
---
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java
(original)
+++
struts/struts2/trunk/plugins/embeddedjsp/src/main/java/org/apache/struts2/jasper/compiler/Validator.java
Fri Jul 12 07:09:42 2013
@@ -1036,6 +1036,9 @@ class Validator {
el = ELParser.parse(attrs.getValue(i));
Iterator<ELNode> nodes = el.iterator();
while (nodes.hasNext()) {
+ if (elExpression && deferredValueIsLiteral) {
+ break;
+ }
ELNode node = nodes.next();
if (node instanceof ELNode.Root) {
if (((ELNode.Root) node).getType() == '$') {
