svn commit: r804380 - in /struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2: JSPLoader.java JSPRuntime.java

[musachy]

Author: musachy
Date: Fri Aug 14 21:35:36 2009
New Revision: 804380

URL: http://svn.apache.org/viewvc?rev=804380&view=rev
Log:
Init JSPs when Servlets are init

Modified:
    
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java
    
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPRuntime.java

Modified: 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java?rev=804380&r1=804379&r2=804380&view=diff
==============================================================================
--- 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java
 (original)
+++ 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPLoader.java
 Fri Aug 14 21:35:36 2009
@@ -39,6 +39,7 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 import javax.servlet.jsp.JspPage;
+import javax.servlet.jsp.HttpJspPage;
 import javax.tools.*;
 import java.io.File;
 import java.io.IOException;
@@ -94,10 +95,14 @@
      * Creates and inits a servlet
      */
     private Servlet createServlet(Class clazz) throws IllegalAccessException, 
InstantiationException, ServletException {
-        Servlet servlet = (Servlet) clazz.newInstance();
         JSPServletConfig config = new 
JSPServletConfig(ServletActionContext.getServletContext());
+
+        Servlet servlet = (Servlet) clazz.newInstance();
         servlet.init(config);
 
+        HttpJspPage page = (HttpJspPage) servlet;
+        page.jspInit();
+        
         return servlet;
     }
 

Modified: 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPRuntime.java
URL: 
http://svn.apache.org/viewvc/struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPRuntime.java?rev=804380&r1=804379&r2=804380&view=diff
==============================================================================
--- 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPRuntime.java
 (original)
+++ 
struts/sandbox/trunk/struts2-jsp-plugin/src/main/java/org/apache/struts2/JSPRuntime.java
 Fri Aug 14 21:35:36 2009
@@ -58,7 +58,6 @@
 
         Servlet servlet = servletCache.get(location);
         HttpJspPage page = (HttpJspPage) servlet;
-        page.jspInit();
 
         page._jspService(request, response);
         if (flush)