- Remove try/catch usage for annotation processing in classic tags. The usage of...

  questionable as well.

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

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index b32b014..e8047cb 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -2308,21 +2308,11 @@ class Generator {
                 } else {
                     out.printin(tagHandlerVar);
                     out.println(".release();");
-                    out.printil("try {");
-                    out.pushIndent();
                     out.printin("org.apache.jasper.runtime.AnnotationHelper.preDestroy(");
                     out.print(VAR_ANNOTATIONPROCESSOR);
                     out.print(", ");
                     out.print(tagHandlerVar);
                     out.println(");");
-                    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.printil("}");
                 }
             }
             if (isTagFile || isFragment) {
@@ -2365,21 +2355,11 @@ class Generator {
             } else {
                 out.printin(tagHandlerVar);
                 out.println(".release();");
-                out.printil("try {");
-                out.pushIndent();
                 out.printin("org.apache.jasper.runtime.AnnotationHelper.preDestroy(");
                 out.print(VAR_ANNOTATIONPROCESSOR);
                 out.print(", ");
                 out.print(tagHandlerVar);
                 out.println(");");
-                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.printil("}");
             }
 
             if (n.implementsTryCatchFinally()) {