Author: markt
Date: Mon Aug 18 09:24:38 2014
New Revision: 1618565
URL: http://svn.apache.org/r1618565
Log:
Fix logic error. No functional impact but the code would have been a little
slower.
Based on a patch by martinschaef.
This closes #13
Modified:
tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java
tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java?rev=1618565&r1=1618564&r2=1618565&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/JasperELResolver.java Mon Aug 18
09:24:38 2014
@@ -69,7 +69,7 @@ public class JasperELResolver extends Co
public synchronized void add(ELResolver elResolver) {
super.add(elResolver);
- if (resolvers.length < size) {
+ if (resolvers.length > size) {
resolvers[size] = elResolver;
} else {
ELResolver[] nr = new ELResolver[size + 1];
Modified: tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java?rev=1618565&r1=1618564&r2=1618565&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java (original)
+++ tomcat/trunk/test/org/apache/jasper/el/TestJasperELResolver.java Mon Aug 18
09:24:38 2014
@@ -62,7 +62,6 @@ public class TestJasperELResolver {
((ELResolver[])getField("resolvers", resolver)).length);
Assert.assertEquals(Integer.valueOf(9 + count),
getField("size", resolver));
-
}
private static final Object getField(String name, Object target)
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1618565&r1=1618564&r2=1618565&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Mon Aug 18 09:24:38 2014
@@ -44,6 +44,17 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+<section name="Tomcat 8.0.12 (markt)">
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ Correct a logic error in the <code>JasperElResolver</code>. There was
no
+ functional impact but the code was less efficient as a result of the
+ error. Based on a patch by martinschaef. (markt)
+ </fix>
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 8.0.11 (markt)">
<subsection name="Catalina">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
