Author: markt
Date: Wed Oct 9 14:38:53 2013
New Revision: 1530637
URL: http://svn.apache.org/r1530637
Log:
Correct logic error in Node.isLiteral() that was returning the inverse of the
desired result when the value was an EL expression.
Added:
tomcat/tc7.0.x/trunk/test/org/apache/jasper/compiler/TestNode.java
- copied unchanged from r1530632,
tomcat/trunk/test/org/apache/jasper/compiler/TestNode.java
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug55642a.jsp
- copied unchanged from r1530632,
tomcat/trunk/test/webapp/bug5nnnn/bug55642a.jsp
tomcat/tc7.0.x/trunk/test/webapp-3.0/bug5nnnn/bug55642b.jsp
- copied unchanged from r1530632,
tomcat/trunk/test/webapp/bug5nnnn/bug55642b.jsp
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1530632
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java?rev=1530637&r1=1530636&r2=1530637&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/Node.java Wed Oct 9
14:38:53 2013
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jasper.compiler;
import java.util.ArrayList;
@@ -2305,7 +2304,7 @@ abstract class Node implements TagConsta
* time.
*/
public boolean isLiteral() {
- return !expression && (el != null) && !namedAttribute;
+ return !expression && (el == null) && !namedAttribute;
}
/**
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1530637&r1=1530636&r2=1530637&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Wed Oct 9 14:38:53 2013
@@ -90,6 +90,15 @@
</fix>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>55642</bug>: Correct logic error in the JSP parser that was
+ incorrectly identifying EL expressions in jsp:param element values as a
+ literal string. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Cluster">
<changelog>
<add>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
