Author: remm
Date: Fri Jan 6 16:50:50 2017
New Revision: 1777647
URL: http://svn.apache.org/viewvc?rev=1777647&view=rev
Log:
Revert try/finally for simple tags.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=1777647&r1=1777646&r2=1777647&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Fri Jan 6
16:50:50 2017
@@ -2659,9 +2659,6 @@ class Generator {
String tagHandlerClassName = tagHandlerClass.getCanonicalName();
writeNewInstance(tagHandlerVar, tagHandlerClassName);
- out.printil("try {");
- out.pushIndent();
-
generateSetters(n, tagHandlerVar, handlerInfo, true);
// JspIdConsumer (after context has been set)
@@ -2713,16 +2710,9 @@ class Generator {
declareScriptingVars(n, VariableInfo.AT_END);
syncScriptingVars(n, VariableInfo.AT_END);
- out.popIndent();
- out.printil("} finally {");
- out.pushIndent();
-
// Resource injection
writeDestroyInstance(tagHandlerVar);
- out.popIndent();
- out.printil("}");
-
n.setEndJavaLine(out.getJavaLine());
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1777647&r1=1777646&r2=1777647&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Jan 6 16:50:50 2017
@@ -51,6 +51,9 @@
<bug>60497</bug>: Follow up fix using a better variable name for the
tag reuse flag. (remm)
</fix>
+ <fix>
+ Revert use of try/finally for simple tags. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="WebSocket">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
