kinman 2002/06/11 16:16:34
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
jasper2/src/share/org/apache/jasper/runtime
PageContextImpl.java
Log:
- Remove JspxState for now, since it is no longer used. The code is just
commented out for now, we may need it later to pass value round other
methods.
- Make sure the "out" is set right at the right place.
Revision Changes Path
1.25 +16 -21
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- Generator.java 11 Jun 2002 03:35:34 -0000 1.24
+++ Generator.java 11 Jun 2002 23:16:34 -0000 1.25
@@ -373,9 +373,12 @@
// Number of tag object that need to be popped
// XXX TODO: use a better criteria
maxTagNesting = pageInfo.getMaxTagNesting();
+/*
if (maxTagNesting > 0) {
out.printil("JspxState _jspxState = new JspxState();");
}
+*/
+ out.printil("JspWriter _jspx_out = null;");
out.printil("try {");
out.pushIndent();
@@ -400,9 +403,7 @@
if (pageInfo.isSession())
out.printil("session = pageContext.getSession();");
out.printil("out = pageContext.getOut();");
- if (maxTagNesting > 0) {
- out.printil("_jspxState.out = out;");
- }
+ out.printil("_jspx_out = out;");
out.println();
}
@@ -426,20 +427,19 @@
* 1. Servlet state object, used to pass servlet info round methods.
*/
private void generateJspState() {
+/*
out.println();
out.printil("static final class JspxState {");
out.pushIndent();
- out.printil("public int tagCount;");
- out.println();
out.printil("public JspWriter out;");
out.println();
out.printil("public JspxState() {");
out.pushIndent();
- out.printil("tagCount = 0;");
out.popIndent();
out.printil("}");
out.popIndent();
out.printil("}");
+*/
}
/**
@@ -1019,7 +1019,8 @@
out.print(parent);
out.print(", ");
}
- out.println("pageContext, _jspxState);");
+// out.println("pageContext, _jspxState);");
+ out.println("pageContext);");
// Set up new buffer for the method
outSave = out;
@@ -1038,7 +1039,8 @@
out.print(parent);
out.print(", ");
}
- out.println("javax.servlet.jsp.PageContext pageContext, JspxState
_jspxState)");
+// out.println("javax.servlet.jsp.PageContext pageContext, JspxState
_jspxState)");
+ out.println("javax.servlet.jsp.PageContext pageContext)");
out.printil(" throws Throwable {");
out.pushIndent();
@@ -1245,10 +1247,6 @@
out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)
{");
// Assume EVAL_BODY_BUFFERED
out.pushIndent();
-
- if (!implementsTryCatchFinally) {
- out.printil("_jspxState.tagCount++;");
- }
out.printil("javax.servlet.jsp.tagext.BodyContent _bc =
pageContext.pushBody();");
out.printil("_bc.clear();");
out.printil("out = _bc;");
@@ -1309,9 +1307,6 @@
out.print(tagEvalVar);
out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)");
out.pushIndent();
- if (!implementsTryCatchFinally) {
- out.printil("_jspxState.tagCount--;");
- }
out.printil("out = pageContext.popBody();");
out.popIndent();
}
@@ -1347,8 +1342,8 @@
out.printil("}");
} else {
out.printin(n.getTagHandlerPoolName());
- out.println(".reuse(");
- out.printin(tagHandlerVar);
+ out.print(".reuse(");
+ out.print(tagHandlerVar);
out.println(");");
}
@@ -1556,6 +1551,7 @@
out.printil("} catch (Throwable t) {");
out.pushIndent();
+ out.printil("out = _jspx_out;");
out.printil("if (out != null && out.getBufferSize() != 0)");
out.pushIndent();
out.printil("out.clearBuffer();");
@@ -1567,7 +1563,6 @@
out.printil("} finally {");
out.pushIndent();
- out.printil("out = _jspxState.out;");
out.printil("if (_jspxFactory != null)
_jspxFactory.releasePageContext(pageContext);");
out.popIndent();
1.10 +4 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- PageContextImpl.java 11 Jun 2002 03:35:35 -0000 1.9
+++ PageContextImpl.java 11 Jun 2002 23:16:34 -0000 1.10
@@ -67,7 +67,6 @@
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.NoSuchElementException;
-import java.util.Stack;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
@@ -173,6 +172,7 @@
}
public void release() {
+ out = baseOut;
try {
if (isIncluded) {
((JspWriterImpl)out).flushBuffer();
@@ -193,7 +193,6 @@
request = null;
response = null;
depth = -1;
- out = baseOut;
baseOut.recycle();
session = null;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
