luehe 2003/01/16 17:21:16 Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java Log: Fixed 16181: JspWriter not restored properly when exception thrown in a tag's body content Revision Changes Path 1.150 +12 -12 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.149 retrieving revision 1.150 diff -u -r1.149 -r1.150 --- Generator.java 17 Jan 2003 00:51:34 -0000 1.149 +++ Generator.java 17 Jan 2003 01:21:16 -0000 1.150 @@ -706,7 +706,7 @@ private Hashtable tagVarNumbers; private String parent; - private String pushBodyCount; + private String pushBodyCountVar; private String simpleTagHandlerVar; private boolean isSimpleTagHandler; private boolean isFragment; @@ -1559,10 +1559,10 @@ // visit body String tmpParent = parent; parent = tagHandlerVar; - String tmpPushBodyCount = null; + String tmpPushBodyCountVar = null; if (n.implementsTryCatchFinally()) { - tmpPushBodyCount = pushBodyCount; - pushBodyCount = tagPushBodyCountVar; + tmpPushBodyCountVar = pushBodyCountVar; + pushBodyCountVar = tagPushBodyCountVar; } boolean tmpIsSimpleTagHandler = isSimpleTagHandler; isSimpleTagHandler = false; @@ -1571,7 +1571,7 @@ parent = tmpParent; if (n.implementsTryCatchFinally()) { - pushBodyCount = tmpPushBodyCount; + pushBodyCountVar = tmpPushBodyCountVar; } isSimpleTagHandler = tmpIsSimpleTagHandler; @@ -1998,8 +1998,8 @@ if (n.implementsTryCatchFinally()) { out.printin(tagPushBodyCountVar); out.println("++;"); - } else if (pushBodyCount != null) { - out.printin(pushBodyCount); + } else if (pushBodyCountVar != null) { + out.printin(pushBodyCountVar); out.println("++;"); } out.printin(tagHandlerVar); @@ -2061,8 +2061,8 @@ if (n.implementsTryCatchFinally()) { out.printin(tagPushBodyCountVar); out.println("--;"); - } else if (pushBodyCount != null) { - out.printin(pushBodyCount); + } else if (pushBodyCountVar != null) { + out.printin(pushBodyCountVar); out.println("--;"); } out.popIndent();
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>