You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by dg...@apache.org on 2003/04/17 06:03:48 UTC

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

dgraham     2003/04/16 21:03:48

  Modified:    src/share/org/apache/struts/action ActionServlet.java
  Log:
  Removed unneeded if statement.
  
  Revision  Changes    Path
  1.145     +15 -12    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.144
  retrieving revision 1.145
  diff -u -r1.144 -r1.145
  --- ActionServlet.java	11 Mar 2003 05:24:55 -0000	1.144
  +++ ActionServlet.java	17 Apr 2003 04:03:47 -0000	1.145
  @@ -1440,16 +1440,18 @@
       private void defaultControllerConfig(ModuleConfig config) {
   
           String value = null;
  -
           ControllerConfig cc = config.getControllerConfig();
  +        
           value = getServletConfig().getInitParameter("bufferSize");
           if (value != null) {
               cc.setBufferSize(Integer.parseInt(value));
           }
  +        
           value = getServletConfig().getInitParameter("content");
           if (value != null) {
               cc.setContentType(value);
           }
  +        
           value = getServletConfig().getInitParameter("locale");
           if (value != null) {
               if (value.equalsIgnoreCase("true") ||
  @@ -1459,23 +1461,24 @@
                   cc.setLocale(false);
               }
           }
  +        
           value = getServletConfig().getInitParameter("maxFileSize");
           if (value != null) {
               cc.setMaxFileSize(value);
           }
  +        
           value = getServletConfig().getInitParameter("nocache");
  -        if (value != null) {
  -            if (value.equalsIgnoreCase("true") ||
  -                value.equalsIgnoreCase("yes")) {
  -                cc.setNocache(true);
  -            } else {
  -                cc.setNocache(false);
  -            }
  +        if ("true".equalsIgnoreCase(value) || "yes".equalsIgnoreCase(value)) {
  +            cc.setNocache(true);
  +        } else {
  +            cc.setNocache(false);
           }
  +        
           value = getServletConfig().getInitParameter("multipartClass");
           if (value != null) {
               cc.setMultipartClass(value);
           }
  +        
           value = getServletConfig().getInitParameter("tempDir");
           if (value != null) {
               cc.setTempDir(value);
  
  
  

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