cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime JspRuntimeLibrary.java

[larryi]

larryi      00/11/20 14:01:47

  Modified:    src/share/org/apache/jasper/runtime Tag: tomcat_32
                        JspRuntimeLibrary.java
  Log:
  Apply Gareth Morgan's patch for value="", but don't allow setProperty with
  param="..." to set the property if parameter is empty.
  
  Modify introspect() to allow introspecthelper() to decide whether to set or
  not set the property since it can tell if the property is an array or not.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.4.4.2   +4 -7      
jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java
  
  Index: JspRuntimeLibrary.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v
  retrieving revision 1.4.4.1
  retrieving revision 1.4.4.2
  diff -u -r1.4.4.1 -r1.4.4.2
  --- JspRuntimeLibrary.java    2000/11/15 01:51:54     1.4.4.1
  +++ JspRuntimeLibrary.java    2000/11/20 22:01:45     1.4.4.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v 
1.4.4.1 2000/11/15 01:51:54 pierred Exp $
  - * $Revision: 1.4.4.1 $
  - * $Date: 2000/11/15 01:51:54 $
  + * $Header: 
/home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/JspRuntimeLibrary.java,v 
1.4.4.2 2000/11/20 22:01:45 larryi Exp $
  + * $Revision: 1.4.4.2 $
  + * $Date: 2000/11/20 22:01:45 $
    *
    * ====================================================================
    * 
  @@ -149,8 +149,6 @@
        while ( e.hasMoreElements() ) {
            String name  = (String) e.nextElement();
            String value = request.getParameter(name);
  -         if (value == null || value.equals(""))
  -             continue;
            introspecthelper(bean, name, value, request, name, true);
        }
       }
  @@ -196,8 +194,7 @@
                        createTypedArray (bean, method, values, t); 
                    }
                } else {
  -                 //XXX please check.
  -                 if(value == null || value.equals("")) return;
  +                 if(value == null || (param != null && value.equals(""))) return;
                    Object oval = convert(value, type);
                    if ( oval != null )
                        method.invoke(bean, new Object[] { oval });