cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/directive Foreach.java

[jvanzyl]

jvanzyl     00/11/15 17:54:37

  Modified:    src/java/org/apache/velocity/runtime/directive Foreach.java
  Log:
  - minor cleanup.
  
  Revision  Changes    Path
  1.19      +7 -2      
jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java
  
  Index: Foreach.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/runtime/directive/Foreach.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Foreach.java      2000/11/11 22:43:25     1.18
  +++ Foreach.java      2000/11/16 01:54:36     1.19
  @@ -81,7 +81,7 @@
    *
    * @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]">Geir Magnusson Jr.</a>
  - * @version $Id: Foreach.java,v 1.18 2000/11/11 22:43:25 geirm Exp $
  + * @version $Id: Foreach.java,v 1.19 2000/11/16 01:54:36 jvanzyl Exp $
    */
   public class Foreach extends Directive
   {
  @@ -144,7 +144,12 @@
           if (listObject instanceof Object[])
           {
               node.setInfo(ARRAY);
  -            sampleElement = ((Object[]) listObject)[0];
  +            Object[] arrayObject = ((Object[]) listObject);
  +            
  +            if (arrayObject.length == 0)
  +                node.setInvalid();
  +            else                
  +                sampleElement = arrayObject[0];
           }            
           else if (implementsMethod(listObject, "iterator"))
           {