Author: remm
Date: Fri May 5 06:50:29 2006
New Revision: 400078
URL: http://svn.apache.org/viewcvs?rev=400078&view=rev
Log:
- Fix indentation.
- jspDestroy didn't need any modification (the instances are tag handler
instances, not tag
instances).
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/viewcvs/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?rev=400078&r1=400077&r2=400078&view=diff
==============================================================================
--- 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 Fri May
5 06:50:29 2006
@@ -422,20 +422,8 @@
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 @@
} 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 @@
} 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()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
