markt       2004/03/03 13:49:55

  Modified:    catalina/src/share/org/apache/catalina/startup
                        ContextConfig.java
  Log:
  Fix bug 19852.
  - Don't remove application parameters on stop (only the parameters specified in 
web.xml would get added back).
  
  Revision  Changes    Path
  1.68      +7 -6      
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java
  
  Index: ContextConfig.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/startup/ContextConfig.java,v
  retrieving revision 1.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- ContextConfig.java        29 Oct 2002 04:17:25 -0000      1.67
  +++ ContextConfig.java        3 Mar 2004 21:49:55 -0000       1.68
  @@ -708,13 +708,14 @@
           }
   
           // Removing application parameters
  +        /*
           ApplicationParameter[] applicationParameters =
               context.findApplicationParameters();
           for (i = 0; i < applicationParameters.length; i++) {
               context.removeApplicationParameter
                   (applicationParameters[i].getName());
           }
  -
  +        */
           // Removing security constraints
           SecurityConstraint[] securityConstraints = context.findConstraints();
           for (i = 0; i < securityConstraints.length; i++) {
  @@ -780,7 +781,7 @@
           for (i = 0; i < parameters.length; i++) {
               context.removeParameter(parameters[i]);
           }
  -
  +        
           // Removing resource env refs
           /*
           String[] resourceEnvRefs = context.findResourceEnvRefs();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to