remm 2004/06/07 05:02:34
Modified: catalina/src/share/org/apache/catalina/core
StandardWrapper.java
Log:
- Merge init-params from the JSP servlet when using a JSP file, as it is intuitive
users will expect the usual shared parameters to be used for the compilation of
this "servlet".
Revision Changes Path
1.43 +12 -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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- StandardWrapper.java 26 May 2004 15:41:29 -0000 1.42
+++ StandardWrapper.java 7 Jun 2004 12:02:34 -0000 1.43
@@ -892,8 +892,18 @@
if ((actualClass == null) && (jspFile != null)) {
Wrapper jspWrapper = (Wrapper)
((Context) getParent()).findChild(Constants.JSP_SERVLET_NAME);
- if (jspWrapper != null)
+ if (jspWrapper != null) {
actualClass = jspWrapper.getServletClass();
+ // Merge init parameters
+ String paramNames[] = jspWrapper.findInitParameters();
+ for (int i = 0; i < paramNames.length; i++) {
+ if (parameters.get(paramNames[i]) == null) {
+ parameters.put
+ (paramNames[i],
+ jspWrapper.findInitParameter(paramNames[i]));
+ }
+ }
+ }
}
// Complain if no servlet class has been specified
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
