You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/05/15 03:35:26 UTC

cvs commit: jakarta-turbine/src/java/org/apache/turbine/util/parser DefaultParameterParser.java

dlr         01/05/14 18:35:26

  Modified:    src/java/org/apache/turbine/util/parser
                        DefaultParameterParser.java
  Log:
  Check TurbineUpload's "auto-handle" status first, since multipart
  requests are not handled automatically if it is not turned on.
  
  Revision  Changes    Path
  1.3       +3 -3      jakarta-turbine/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
  
  Index: DefaultParameterParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DefaultParameterParser.java	2001/05/06 17:06:46	1.2
  +++ DefaultParameterParser.java	2001/05/15 01:35:25	1.3
  @@ -90,7 +90,7 @@
    * @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
    * @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
    * @author <a href="mailto:sean@informage.net">Sean Legassick</a>
  - * @version $Id: DefaultParameterParser.java,v 1.2 2001/05/06 17:06:46 jvanzyl Exp $
  + * @version $Id: DefaultParameterParser.java,v 1.3 2001/05/15 01:35:25 dlr Exp $
    */
   public class DefaultParameterParser
       extends BaseValueParser
  @@ -181,8 +181,8 @@
           String tmp = null;
   
           tmp = req.getHeader("Content-type");
  -        if (tmp != null && tmp.startsWith("multipart/form-data") &&
  -            TurbineUpload.getAutomatic())
  +        if (TurbineUpload.getAutomatic() &&
  +            tmp != null && tmp.startsWith("multipart/form-data"))
           {
               try
               {
  
  
  

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