tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core StandardWrapper.java
Date Mon, 04 Oct 2004 16:40:58 GMT
luehe       2004/10/04 09:40:57

  Modified:    catalina/src/share/org/apache/catalina/core
                        StandardWrapper.java
  Log:
  Share the same JspServlet instance between
  - all JSPs that are referened as a <jsp-file> inside a <servlet> declaration
  - all other JSPs
  
  We used to instantiate a JspServlet for each <jsp-file> inside a
  <servlet>, leading to inaccurate JSP stats
  
  Revision  Changes    Path
  1.48      +2 -2      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java
  
  Index: StandardWrapper.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/StandardWrapper.java,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- StandardWrapper.java	1 Oct 2004 01:18:12 -0000	1.47
  +++ StandardWrapper.java	4 Oct 2004 16:40:57 -0000	1.48
  @@ -867,7 +867,6 @@
                   Wrapper jspWrapper = (Wrapper)
                       ((Context) getParent()).findChild(Constants.JSP_SERVLET_NAME);
                   if (jspWrapper != null) {
  -                    actualClass = jspWrapper.getServletClass();
                       // Merge init parameters
                       String paramNames[] = jspWrapper.findInitParameters();
                       for (int i = 0; i < paramNames.length; i++) {
  @@ -877,6 +876,7 @@
                                    jspWrapper.findInitParameter(paramNames[i]));
                           }
                       }
  +                    return jspWrapper.allocate();
                   }
               }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message