Author: remy.maucherat(a)jboss.com Date: 2010-03-25 19:00:05 -0400 (Thu, 25 Mar 2010) New Revision: 1423 Modified: trunk/java/org/apache/jasper/compiler/AttributeParser.java trunk/java/org/apache/jasper/compiler/Parser.java trunk/webapps/docs/changelog.xml Log: - Port another regression fix. Modified: trunk/java/org/apache/jasper/compiler/AttributeParser.java =================================================================== --- trunk/java/org/apache/jasper/compiler/AttributeParser.java 2010-03-25 19:47:57 UTC (rev 1422) +++ trunk/java/org/apache/jasper/compiler/AttributeParser.java 2010-03-25 23:00:05 UTC (rev 1423) @@ -122,9 +122,7 @@ boolean strict) { this.input = input; this.quote = quote; - // If quote is null this is a scriptign expressions and any EL syntax - // should be ignored - this.isELIgnored = isELIgnored || (quote == 0); + this.isELIgnored = isELIgnored; this.isDeferredSyntaxAllowedAsLiteral = isDeferredSyntaxAllowedAsLiteral; this.strict = strict; Modified: trunk/java/org/apache/jasper/compiler/Parser.java =================================================================== --- trunk/java/org/apache/jasper/compiler/Parser.java 2010-03-25 19:47:57 UTC (rev 1422) +++ trunk/java/org/apache/jasper/compiler/Parser.java 2010-03-25 23:00:05 UTC (rev 1423) @@ -242,12 +242,16 @@ String ret = null; try { - char quote = 0; - if (watch.length() == 1) { - quote = watch.charAt(0); - } + char quote = watch.charAt(watch.length() - 1); + + // If watch is longer than 1 character this is a scripting + // expression and EL is always ignored + boolean isElIgnored = + pageInfo.isELIgnored() || watch.length() > 1; + ret = AttributeParser.getUnquoted(reader.getText(start, stop), - quote, pageInfo.isELIgnored(), pageInfo.isDeferredSyntaxAllowedAsLiteral()); + quote, isElIgnored, + pageInfo.isDeferredSyntaxAllowedAsLiteral()); } catch (IllegalArgumentException iae) { err.jspError(start, iae.getMessage()); } Modified: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2010-03-25 19:47:57 UTC (rev 1422) +++ trunk/webapps/docs/changelog.xml 2010-03-25 23:00:05 UTC (rev 1423) @@ -48,6 +48,9 @@ <bug>48795</bug>: Add a new property to control if the next request always triggers recompilation after a compilation failure. (markt) </update> + <fix> + <bug>45015</bug>: Fix regression. (markt) + </fix> </changelog> </subsection> </section>