luehe 2003/01/15 14:46:29
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Fixed 15961 ("getBodyContent() is not returning null when the action
has only jsp:attribute actions within the body") for simple tag handlers
Revision Changes Path
1.148 +12 -10
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.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- Generator.java 11 Jan 2003 00:52:14 -0000 1.147
+++ Generator.java 15 Jan 2003 22:46:29 -0000 1.148
@@ -1756,13 +1756,15 @@
}
public void visit(Node.JspBody n) throws JasperException {
- if (isSimpleTagHandler) {
- out.printin(simpleTagHandlerVar);
- out.print(".setJspBody(");
- generateJspFragment(n, simpleTagHandlerVar);
- out.println(");");
- } else {
- visitBody(n);
+ if (n.getBody() != null) {
+ if (isSimpleTagHandler) {
+ out.printin(simpleTagHandlerVar);
+ out.print(".setJspBody(");
+ generateJspFragment(n, simpleTagHandlerVar);
+ out.println(");");
+ } else {
+ visitBody(n);
+ }
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
