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

(-)EmptyOperator.java.orig (-11 / +4 lines)
Lines 56-63 Link Here
56
package org.apache.taglibs.standard.lang.jstl;
56
package org.apache.taglibs.standard.lang.jstl;
57
57
58
import java.lang.reflect.Array;
58
import java.lang.reflect.Array;
59
import java.util.List;
59
import java.util.Collection;
60
import java.util.Map;
61
60
62
/**
61
/**
63
 *
62
 *
Lines 124-138 Link Here
124
      return PrimitiveObjects.getBoolean (true);
123
      return PrimitiveObjects.getBoolean (true);
125
    }
124
    }
126
125
127
    // See if the value is an empty List
126
    // See if the value is an empty Collection
128
    else if (pValue instanceof List &&
127
    else if (pValue instanceof Collection &&
129
	     ((List) pValue).isEmpty ()) {
128
	     ((Collection) pValue).isEmpty ()) {
130
      return PrimitiveObjects.getBoolean (true);
131
    }
132
133
    // See if the value is an empty Map
134
    else if (pValue instanceof Map &&
135
	     ((Map) pValue).isEmpty ()) {
136
      return PrimitiveObjects.getBoolean (true);
129
      return PrimitiveObjects.getBoolean (true);
137
    }
130
    }
138
131

Return to bug 18816