- Fix indentation.

- jspDestroy didn't need any modification (the instances are tag handler instances, not tag
  instances).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@400078 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 0728488..744b9d9 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -422,20 +422,8 @@ class Generator {
         \r
         if (isPoolingEnabled) {\r
             for (int i = 0; i < tagHandlerPoolNames.size(); i++) {\r
-                out.printin("Tag handler = ");\r
-                out.printin(tagHandlerPoolNames.elementAt(i));\r
-                out.println(";");\r
-                out.println("handler.release();");\r
-                out.println("try {");\r
-                out.pushIndent();\r
-                out.println("org.apache.jasper.runtime.AnnotationProcessor.preDestroy(handler);");\r
-                out.popIndent();\r
-                out.println("} catch (Exception e) {");\r
-                out.pushIndent();\r
-                out.println("log(\"Error processing preDestroy on tag instance of \" ");\r
-                out.println(" + handler.getClass().getName());");\r
-                out.popIndent();\r
-                out.println("}");\r
+                                out.printin((String) tagHandlerPoolNames.elementAt(i));\r
+                                out.println(".release();");\r
             }\r
         }\r
         \r
@@ -2303,19 +2291,19 @@ class Generator {
                 } else {\r
                     out.printin(tagHandlerVar);\r
                     out.println(".release();");\r
-                    out.println("try {");\r
+                    out.printil("try {");\r
                     out.pushIndent();\r
                     out.printin("org.apache.jasper.runtime.AnnotationProcessor.preDestroy(");\r
                     out.print(tagHandlerVar);\r
                     out.println(");");\r
                     out.popIndent();\r
-                    out.println("} catch (Exception e) {");\r
+                    out.printil("} catch (Exception e) {");\r
                     out.pushIndent();\r
-                    out.println("log(\"Error processing preDestroy on tag instance of \" +");\r
-                    out.printin(tagHandlerVar);\r
+                    out.printin("log(\"Error processing preDestroy on tag instance of \" +");\r
+                    out.print(tagHandlerVar);\r
                     out.println(".getClass().getName());");\r
                     out.popIndent();\r
-                    out.println("}");\r
+                    out.printil("}");\r
                 }\r
             }\r
             if (isTagFile || isFragment) {\r
@@ -2358,17 +2346,19 @@ class Generator {
             } else {\r
                 out.printin(tagHandlerVar);\r
                 out.println(".release();");\r
-                out.println("try {");\r
+                out.printil("try {");\r
                 out.pushIndent();\r
                 out.printin("org.apache.jasper.runtime.AnnotationProcessor.preDestroy(");\r
                 out.print(tagHandlerVar);\r
                 out.println(");");\r
-                out.println("} catch (Exception e) {");\r
-                out.println("log(\"Error processing preDestroy on tag instance of \" +");\r
-                out.printin(tagHandlerVar);\r
+                out.popIndent();\r
+                out.printil("} catch (Exception e) {");\r
+                out.pushIndent();\r
+                out.printin("log(\"Error processing preDestroy on tag instance of \" +");\r
+                out.print(tagHandlerVar);\r
                 out.println(".getClass().getName());");\r
                 out.popIndent();\r
-                out.println("}");\r
+                out.printil("}");\r
             }\r
 \r
             if (n.implementsTryCatchFinally()) {\r