--- apache/jasper/tagplugins/jstl/core/ForEach.java	(revision 1416791)
+++ apache/jasper/tagplugins/jstl/core/ForEach.java	(working copy)
@@ -155,6 +155,10 @@ 
         ctxt.generateJavaSource("else if (" + itemsV + " instanceof Map)");
         ctxt.generateJavaSource(iterV + "=((Map)" + itemsV + ").entrySet().iterator();");
         
+       // null
+        ctxt.generateJavaSource("else if (" + itemsV + " == null)");
+        ctxt.generateJavaSource(iterV + "= java.util.Collections.emptySet().iterator();");
+
         if (hasBegin) {
             String tV = ctxt.getTemporaryVariableName();
             ctxt.generateJavaSource("for (int " + tV + "=" + beginV + ";" +