luehe 2002/08/02 09:31:00
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
If tag handler implements SimpleTag, it must be scriptless, but it
still may expose scripting variables, in which case its invocation
must not be moved into a separate method.
Revision Changes Path
1.58 +5 -7
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.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Generator.java 2 Aug 2002 01:31:08 -0000 1.57
+++ Generator.java 2 Aug 2002 16:30:59 -0000 1.58
@@ -1518,8 +1518,7 @@
ServletWriter outSave = null;
MethodsBuffer methodsBufferSave = null;
Node.ChildInfo ci = n.getChildInfo();
- if (n.implementsSimpleTag()
- || (ci.isScriptless() && !ci.hasScriptingVars())) {
+ if (ci.isScriptless() && !ci.hasScriptingVars()) {
// The tag handler and its body code can reside in a separate
// method if it is scriptless and does not have any scripting
// variable defined.
@@ -1589,8 +1588,7 @@
generateCustomEnd(n, tagHandlerVar, tagEvalVar);
}
- if (n.implementsSimpleTag()
- || (ci.isScriptless() && !ci.hasScriptingVars())) {
+ if (ci.isScriptless() && !ci.hasScriptingVars()) {
// Generate end of method
if (methodNesting > 0) {
out.printil("return false;");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
