- Always call jspInit (some work in always done there, now).

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

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 9a2dc1c..9aa9ed0 100644 (file)
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -391,8 +391,7 @@ class Generator {
         if (isPoolingEnabled) {
             for (int i = 0; i < tagHandlerPoolNames.size(); i++) {
                 out.printin(tagHandlerPoolNames.elementAt(i));
-                out
-                        .print(" = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(");
+                out.print(" = org.apache.jasper.runtime.TagHandlerPool.getTagHandlerPool(");
                 if (ctxt.isTagFile()) {
                     out.print("config");
                 } else {
@@ -562,8 +561,7 @@ class Generator {
         out.print(servletClassName);
         out.print(" extends ");
         out.println(pageInfo.getExtends());
-        out
-                .printin("    implements org.apache.jasper.runtime.JspSourceDependent");
+        out.printin("    implements org.apache.jasper.runtime.JspSourceDependent");
         if (!pageInfo.isThreadSafe()) {
             out.println(",");
             out.printin("                 SingleThreadModel");
@@ -589,8 +587,7 @@ class Generator {
         // Now the service method
         out.printin("public void ");
         out.print(serviceMethodName);
-        out
-                .println("(HttpServletRequest request, HttpServletResponse response)");
+        out.println("(HttpServletRequest request, HttpServletResponse response)");
         out.println("        throws java.io.IOException, ServletException {");
 
         out.pushIndent();
@@ -604,12 +601,10 @@ class Generator {
             out.printil("HttpSession session = null;");
 
         if (pageInfo.isErrorPage()) {
-            out
-                    .printil("Throwable exception = org.apache.jasper.runtime.JspRuntimeLibrary.getThrowable(request);");
+            out.printil("Throwable exception = org.apache.jasper.runtime.JspRuntimeLibrary.getThrowable(request);");
             out.printil("if (exception != null) {");
             out.pushIndent();
-            out
-                    .printil("response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);");
+            out.printil("response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);");
             out.popIndent();
             out.printil("}");
         }
@@ -3428,12 +3423,10 @@ class Generator {
         out.printin("public final class ");
         out.println(className);
         out.printil("    extends javax.servlet.jsp.tagext.SimpleTagSupport");
-        out
-                .printin("    implements org.apache.jasper.runtime.JspSourceDependent");
+        out.printin("    implements org.apache.jasper.runtime.JspSourceDependent");
         if (tagInfo.hasDynamicAttributes()) {
             out.println(",");
-            out
-                    .printin("               javax.servlet.jsp.tagext.DynamicAttributes");
+            out.printin("               javax.servlet.jsp.tagext.DynamicAttributes");
         }
         out.println(" {");
         out.println();
@@ -3442,7 +3435,6 @@ class Generator {
         /*
          * Class body begins here
          */
-
         generateDeclarations(tag);
 
         // Static initializations here
@@ -3468,8 +3460,7 @@ class Generator {
         genPreambleMethods();
 
         // Now the doTag() method
-        out
-                .printil("public void doTag() throws JspException, java.io.IOException {");
+        out.printil("public void doTag() throws JspException, java.io.IOException {");
 
         if (ctxt.isPrototypeMode()) {
             out.printil("}");
@@ -3485,23 +3476,18 @@ class Generator {
          * implicit object in tag files. Declare _jspx_page_context, so we can
          * share the code generator with JSPs.
          */
-        out
-                .printil("PageContext _jspx_page_context = (PageContext)jspContext;");
-
+        out.printil("PageContext _jspx_page_context = (PageContext)jspContext;");
+        
         // Declare implicit objects.
         out.printil("HttpServletRequest request = "
                 + "(HttpServletRequest) _jspx_page_context.getRequest();");
         out.printil("HttpServletResponse response = "
                 + "(HttpServletResponse) _jspx_page_context.getResponse();");
         out.printil("HttpSession session = _jspx_page_context.getSession();");
-        out
-                .printil("ServletContext application = _jspx_page_context.getServletContext();");
-        out
-                .printil("ServletConfig config = _jspx_page_context.getServletConfig();");
+        out.printil("ServletContext application = _jspx_page_context.getServletContext();");
+        out.printil("ServletConfig config = _jspx_page_context.getServletConfig();");
         out.printil("JspWriter out = jspContext.getOut();");
-        if (isPoolingEnabled && !tagHandlerPoolNames.isEmpty()) {
-            out.printil("_jspInit(config);");
-        }
+        out.printil("_jspInit(config);");
         
         // set current JspContext on ELContext
         out.printil("jspContext.getELContext().putContext(JspContext.class,jspContext);");
@@ -3764,7 +3750,7 @@ class Generator {
                 
                 // we need to scope the modified VariableMapper for consistency and performance
                 if (!variableMapperVar) {
-                    out.println("javax.el.VariableMapper _el_variablemapper = jspContext.getELContext().getVariableMapper();");
+                    out.printil("javax.el.VariableMapper _el_variablemapper = jspContext.getELContext().getVariableMapper();");
                     variableMapperVar = true;
                 }