You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by cr...@locus.apache.org on 2000/12/01 20:54:44 UTC

cvs commit: jakarta-struts/src/share/org/apache/struts/action ActionServlet.java

craigmcc    00/12/01 11:54:43

  Modified:    src/share/org/apache/struts/action ActionServlet.java
  Log:
  Correctly process the "nocache" initialization parameter.
  
  Submitted by:  Jay Walters <jw...@netnumina.com> and
                 Ralph Schaer <sc...@ess.ch>
  
  Revision  Changes    Path
  1.40      +5 -5      jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java
  
  Index: ActionServlet.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- ActionServlet.java	2000/11/30 20:12:53	1.39
  +++ ActionServlet.java	2000/12/01 19:54:42	1.40
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.39 2000/11/30 20:12:53 craigmcc Exp $
  - * $Revision: 1.39 $
  - * $Date: 2000/11/30 20:12:53 $
  + * $Header: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionServlet.java,v 1.40 2000/12/01 19:54:42 craigmcc Exp $
  + * $Revision: 1.40 $
  + * $Date: 2000/12/01 19:54:42 $
    *
    * ====================================================================
    *
  @@ -203,7 +203,7 @@
    * </ul>
    *
    * @author Craig R. McClanahan
  - * @version $Revision: 1.39 $ $Date: 2000/11/30 20:12:53 $
  + * @version $Revision: 1.40 $ $Date: 2000/12/01 19:54:42 $
    */
   
   public class ActionServlet
  @@ -1203,8 +1203,8 @@
                   locale = false;
           }
   
  +        value = getServletConfig().getInitParameter("nocache");
           if (value != null) {
  -            value = getServletConfig().getInitParameter("nocache");
               if ("true".equalsIgnoreCase(value) ||
                   "yes".equalsIgnoreCase(value))
                   nocache = true;