View | Details | Raw Unified | Return to bug 54242
Collapse All | Expand All

(-)apache/jasper/tagplugins/jstl/core/ForEach.java (+4 lines)
Lines 155-160 Link Here
155
        ctxt.generateJavaSource("else if (" + itemsV + " instanceof Map)");
155
        ctxt.generateJavaSource("else if (" + itemsV + " instanceof Map)");
156
        ctxt.generateJavaSource(iterV + "=((Map)" + itemsV + ").entrySet().iterator();");
156
        ctxt.generateJavaSource(iterV + "=((Map)" + itemsV + ").entrySet().iterator();");
157
        
157
        
158
       // null
159
        ctxt.generateJavaSource("else if (" + itemsV + " == null)");
160
        ctxt.generateJavaSource(iterV + "= java.util.Collections.emptySet().iterator();");
161
158
        if (hasBegin) {
162
        if (hasBegin) {
159
            String tV = ctxt.getTemporaryVariableName();
163
            String tV = ctxt.getTemporaryVariableName();
160
            ctxt.generateJavaSource("for (int " + tV + "=" + beginV + ";" +
164
            ctxt.generateJavaSource("for (int " + tV + "=" + beginV + ";" +

Return to bug 54242