Author: markt
Date: Mon Sep 23 13:58:50 2013
New Revision: 1525595
URL: http://svn.apache.org/r1525595
Log:
https://issues.apache.org/bugzilla/show_bug.cgi?id=55582
Correct concurrency issue that can result in two instances of JspServletWrapper
being created for one tag.
Patch provided by Sheldon Shao.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1525593
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1525595&r1=1525594&r2=1525595&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
Mon Sep 23 13:58:50 2013
@@ -533,9 +533,9 @@ class TagFileProcessor {
JspCompilationContext ctxt = compiler.getCompilationContext();
JspRuntimeContext rctxt = ctxt.getRuntimeContext();
- JspServletWrapper wrapper = rctxt.getWrapper(wrapperUri);
synchronized (rctxt) {
+ JspServletWrapper wrapper = rctxt.getWrapper(wrapperUri);
if (wrapper == null) {
wrapper = new JspServletWrapper(ctxt.getServletContext(), ctxt
.getOptions(), tagFilePath, tagInfo, ctxt
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=1525595&r1=1525594&r2=1525595&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Sep 23 13:58:50 2013
@@ -55,6 +55,15 @@
They eventually become mixed with the numbered issues. (I.e., numbered
issues to not "pop up" wrt. others).
-->
+<section name="Tomcat 7.0.44 (violetagg)">
+ <subsection name="Jasper">
+ <changelog>
+ <bug>55582</bug>: Correct concurrency issue that can result in two
+ instances of JspServletWrapper being created for one tag Patch provided
by
+ Sheldon Shao. (markt)
+ </changelog>
+ </subsection>
+</section>
<section name="Tomcat 7.0.43 (violetagg)" rtext="not released">
<subsection name="Catalina">
<changelog>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
