Author: markt
Date: Mon Aug 18 09:26:53 2014
New Revision: 1618567
URL: http://svn.apache.org/r1618567
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/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1618565
Modified: tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java?rev=1618567&r1=1618566&r2=1618567&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/el/JasperELResolver.java Mon
Aug 18 09:26:53 2014
@@ -63,7 +63,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/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java?rev=1618567&r1=1618566&r2=1618567&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
(original)
+++ tomcat/tc7.0.x/trunk/test/org/apache/jasper/el/TestJasperELResolver.java
Mon Aug 18 09:26:53 2014
@@ -59,7 +59,6 @@ public class TestJasperELResolver {
((ELResolver[])getField("resolvers", resolver)).length);
Assert.assertEquals(Integer.valueOf(7 + count),
getField("size", resolver));
-
}
private static final Object getField(String name, Object target)
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=1618567&r1=1618566&r2=1618567&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Aug 18 09:26:53 2014
@@ -115,6 +115,11 @@
treat bridge methods as duplicates of the method they bridge to. In
this
case always call the target of the bridge method. (markt)
</fix>
+ <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>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
