luehe 2004/05/10 10:30:30
Modified: jasper2/src/share/org/apache/jasper/tagplugins/jstl
ForEach.java
Log:
Fixed Bugzilla 28840 ("NPE when using an Iterator for items in a JSTL forEach tag")
Patch provided by: [EMAIL PROTECTED]
Revision Changes Path
1.8 +2 -0
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/ForEach.java
Index: ForEach.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/tagplugins/jstl/ForEach.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ForEach.java 13 Apr 2004 18:25:34 -0000 1.7
+++ ForEach.java 10 May 2004 17:30:29 -0000 1.8
@@ -137,6 +137,8 @@
ctxt.generateJavaSource("else if (" + itemsV + " instanceof Collection)");
ctxt.generateJavaSource(iterV + "=((Collection)" + itemsV +
").iterator();");
+ ctxt.generateJavaSource("else if (" + itemsV + " instanceof Iterator)");
+ ctxt.generateJavaSource(iterV + "=(Iterator)" + itemsV + ";");
if (hasBegin) {
String tV = ctxt.getTemporaryVariableName();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
