kinman 2002/11/04 13:24:43
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Generator.java
jasper2/src/share/org/apache/jasper/runtime Tag:
tomcat_4_branch HttpJspBase.java
Log:
- Fix 14197: allow jspDestroy to be overrided.
Revision Changes Path
No revision
No revision
1.35.2.11 +7 -4
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.35.2.10
retrieving revision 1.35.2.11
diff -u -r1.35.2.10 -r1.35.2.11
--- Generator.java 12 Oct 2002 01:08:31 -0000 1.35.2.10
+++ Generator.java 4 Nov 2002 21:24:42 -0000 1.35.2.11
@@ -312,7 +312,10 @@
* release() method on every tag handler in any of the tag handler pools.
*/
private void generateDestroy() {
- out.printil("public void jspDestroy() {");
+ if (tagHandlerPoolNames.size() <= 0)
+ return;
+
+ out.printil("public void _jspDestroy() {");
out.pushIndent();
for (int i=0; i<tagHandlerPoolNames.size(); i++) {
out.printin((String) tagHandlerPoolNames.elementAt(i));
No revision
No revision
1.3.2.1 +4 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java
Index: HttpJspBase.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/HttpJspBase.java,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -r1.3 -r1.3.2.1
--- HttpJspBase.java 14 Jun 2002 20:45:55 -0000 1.3
+++ HttpJspBase.java 4 Nov 2002 21:24:43 -0000 1.3.2.1
@@ -125,6 +125,7 @@
public final void destroy() {
jspDestroy();
+ _jspDestroy();
}
/**
@@ -140,6 +141,9 @@
}
public void jspDestroy() {
+ }
+
+ protected void _jspDestroy() {
}
/**
--
To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@;jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@;jakarta.apache.org>
