From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 5 May 2006 13:50:29 +0000 (+0000)
Subject: - Fix indentation.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=c716465b33c62df4574fccc4d62ee7c6538f5e30;p=tomcat7.0

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