You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by ge...@apache.org on 2001/10/24 05:06:17 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/runtime/directive Foreach.java
geirm 01/10/23 20:06:17
Modified: src/java/org/apache/velocity/runtime/directive Foreach.java
Log:
Supports alteration to ArrayIterator to support array of primitives,
addressing bug# 4370.
Revision Changes Path
1.40 +4 -4 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.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Foreach.java 2001/10/22 03:53:24 1.39
+++ Foreach.java 2001/10/24 03:06:17 1.40
@@ -89,7 +89,7 @@
*
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:geirm@optonline.net">Geir Magnusson Jr.</a>
- * @version $Id: Foreach.java,v 1.39 2001/10/22 03:53:24 jon Exp $
+ * @version $Id: Foreach.java,v 1.40 2001/10/24 03:06:17 geirm Exp $
*/
public class Foreach extends Directive
{
@@ -235,7 +235,7 @@
if ( type == UNKNOWN )
{
- if (listObject instanceof Object[])
+ if ( listObject.getClass().isArray() )
type = INFO_ARRAY;
else if ( listObject instanceof Collection)
type = INFO_COLLECTION;
@@ -292,7 +292,7 @@
return new EnumerationIterator( (Enumeration) listObject );
case INFO_ARRAY:
- return new ArrayIterator( (Object [] ) listObject );
+ return new ArrayIterator( listObject );
case INFO_MAP:
return ( (Map) listObject).values().iterator();
@@ -376,7 +376,7 @@
return true;
}
-
+
}