Author: remm
Date: Mon Mar 12 07:24:55 2007
New Revision: 517227

URL: http://svn.apache.org/viewvc?view=rev&rev=517227
Log:
- Remove try/catch usage for annotation processing in classic tags. The usage 
of the log method might have been
  questionable as well.

Modified:
    tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?view=diff&rev=517227&r1=517226&r2=517227
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Mon Mar 
12 07:24:55 2007
@@ -2308,21 +2308,11 @@
                 } 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 @@
             } 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()) {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to