Author: markt
Date: Fri Nov 27 18:31:53 2009
New Revision: 884944
URL: http://svn.apache.org/viewvc?rev=884944&view=rev
Log:
Fix regression in previous fix for
https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=884944&r1=884943&r2=884944&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Fri Nov 27 18:31:53 2009
@@ -40,8 +40,6 @@
+1: kkolinko, markt
-1:
-
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=39844
Port r588477 (fix for #43668) by billbarker that corrected this for Tomcat 6
http://people.apache.org/~markt/patches/2009-07-11-bug39844.patch
@@ -86,12 +84,6 @@
+1: markt
-1:
-* Fix regression in fix for
- https://issues.apache.org/bugzilla/show_bug.cgi?id=38797
- http://svn.apache.org/viewvc?rev=809131&view=rev
- +1: markt, kkolinko, mturk
- -1:
-
* Port r795052 from modules/ha to modules/cluster
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40551
Enable the JvmRouteBinderValve to work with PersistentManagers as well as
clusters
Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=884944&r1=884943&r2=884944&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original)
+++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Fri Nov 27
18:31:53 2009
@@ -98,6 +98,9 @@
<subsection name="Jasper">
<changelog>
<fix>
+ <bug>38797</bug>: Fix regression in previous fix for this bug. (markt)
+ </fix>
+ <fix>
<bug>41661</bug>: Fix thread safety issue in JspConfig.init() (markt)
</fix>
<fix>
Modified:
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java?rev=884944&r1=884943&r2=884944&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
(original)
+++
tomcat/tc5.5.x/trunk/jasper/src/share/org/apache/jasper/compiler/Generator.java
Fri Nov 27 18:31:53 2009
@@ -1690,6 +1690,17 @@
generateLocalVariables(out, n);
}
+ // Add the named objects to the lits of 'introduced' names to
enable
+ // a later test as per JSP.5.3
+ VariableInfo[] infos = n.getVariableInfos();
+ if (infos != null && infos.length > 0) {
+ for (int i = 0; i < infos.length; i++) {
+ VariableInfo info = infos[i];
+ if (info != null && info.getVarName() != null)
+ pageInfo.getVarInfoNames().add(info.getVarName());
+ }
+ }
+
if (n.implementsSimpleTag()) {
generateCustomDoTag(n, handlerInfo, tagHandlerVar);
} else {
@@ -1747,17 +1758,6 @@
// restore previous writer
out = outSave;
}
-
- // Add the named objects to the lits of 'introduced' names to
enable
- // a later test as per JSP.5.3
- VariableInfo[] infos = n.getVariableInfos();
- if (infos != null && infos.length > 0) {
- for (int i = 0; i < infos.length; i++) {
- VariableInfo info = infos[i];
- if (info != null && info.getVarName() != null)
- pageInfo.getVarInfoNames().add(info.getVarName());
- }
- }
}
private static final String SINGLE_QUOTE = "'";
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
