Author: markt
Date: Wed Apr 16 14:49:00 2008
New Revision: 648867
URL: http://svn.apache.org/viewvc?rev=648867&view=rev
Log:
Reduce syncs when evaluating EL expressions.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=648867&r1=648866&r2=648867&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Apr 16 14:49:00 2008
@@ -85,14 +85,6 @@
rjung: Simply use: "return Number.class.isAssignableFrom(type);"
since all other conditions are special cases of this one.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44408
- Avoid bottleneck by calling synchronized method only once
- http://svn.apache.org/viewvc?rev=646889&view=rev
- +1: markt, rjung
- +1: remm (I never tested this was a problem in the past, though, maybe I
didn't test right)
- -1:
- rjung: Please also fix indentation.
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44392
Correct handling of HTML entities in SSI processing
http://svn.apache.org/viewvc?rev=647289&view=rev
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java?rev=648867&r1=648866&r2=648867&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/runtime/PageContextImpl.java
Wed Apr 16 14:49:00 2008
@@ -70,6 +70,8 @@
*/
public class PageContextImpl extends PageContext {
+ private static final JspFactory jspf = JspFactory.getDefaultFactory();
+
private BodyContentImpl[] outs;
private int depth;
@@ -895,7 +897,7 @@
final ProtectedFunctionMapper functionMap, final
boolean escape)
throws ELException {
Object retValue;
- final ExpressionFactory exprFactory =
JspFactory.getDefaultFactory().getJspApplicationContext(pageContext.getServletContext()).getExpressionFactory();
+ final ExpressionFactory exprFactory =
jspf.getJspApplicationContext(pageContext.getServletContext()).getExpressionFactory();
if (SecurityUtil.isPackageProtectionEnabled()) {
try {
retValue = AccessController
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=648867&r1=648866&r2=648867&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Apr 16 14:49:00 2008
@@ -130,6 +130,10 @@
<bug>43741</bug>: Correctly handle dependencies for tag files in JARs.
(markt)
</fix>
+ <fix>
+ <bug>44408</bug>: Reduce synchronisation when evaluating EL
expressions.
+ Patch provided by Robert Andersson. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Webapps">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
