cvs commit: jakarta-struts/src/share/org/apache/struts/util BeanUtils.java

[craigmcc]

craigmcc    01/05/20 21:25:11

  Modified:    src/share/org/apache/struts/util BeanUtils.java
  Log:
  Port JDK 1.2 compatibility fix to HEAD branch.
  
  Revision  Changes    Path
  1.29      +6 -5      jakarta-struts/src/share/org/apache/struts/util/BeanUtils.java
  
  Index: BeanUtils.java
  ===================================================================
  RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/util/BeanUtils.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- BeanUtils.java    2001/05/20 01:18:27     1.28
  +++ BeanUtils.java    2001/05/21 04:25:10     1.29
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/BeanUtils.java,v 1.28 
2001/05/20 01:18:27 craigmcc Exp $
  - * $Revision: 1.28 $
  - * $Date: 2001/05/20 01:18:27 $
  + * $Header: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/util/BeanUtils.java,v 1.29 
2001/05/21 04:25:10 craigmcc Exp $
  + * $Revision: 1.29 $
  + * $Date: 2001/05/21 04:25:10 $
    *
    * ====================================================================
    *
  @@ -88,7 +88,7 @@
    * @author Craig R. McClanahan
    * @author Ralph Schaer
    * @author Chris Audley
  - * @version $Revision: 1.28 $ $Date: 2001/05/20 01:18:27 $
  + * @version $Revision: 1.29 $ $Date: 2001/05/21 04:25:10 $
    */
   
   public class BeanUtils {
  @@ -162,7 +162,8 @@
                  NoSuchMethodException {
   
           if (bean == null)
  -            return (Collections.EMPTY_MAP);
  +            //            return (Collections.EMPTY_MAP);
  +            return (new HashMap());
           PropertyDescriptor descriptors[] =
               PropertyUtils.getPropertyDescriptors(bean);
           Map description = new HashMap(descriptors.length);