Attachment #26928 for bug #47371

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




        if (isNumber(obj)) {
            return coerce((Number) obj);
        }
        if (obj instanceof String) {
            return coerce((String) obj);
        }
        if (obj == null || "".equals(obj)) {
            return coerce(ZERO);
        }
        if (obj instanceof String) {
            return coerce((String) obj);
        }

        if (obj instanceof Character) {
            return coerce(Short.valueOf((short) ((Character) obj).charValue()));

Return to bug 47371

Lines 394-405 Link Here

(-)org/apache/el/lang/ELArithmetic.java (-3 / +3 lines)
394	if (isNumber(obj)) {	394	if (isNumber(obj)) {
395	return coerce((Number) obj);	395	return coerce((Number) obj);
396	}	396	}
397	if (obj instanceof String) {
398	return coerce((String) obj);
399	}
400	if (obj == null \|\| "".equals(obj)) {	397	if (obj == null \|\| "".equals(obj)) {
401	return coerce(ZERO);	398	return coerce(ZERO);
402	}	399	}
		400	if (obj instanceof String) {
		401	return coerce((String) obj);
		402	}
403		403
404	if (obj instanceof Character) {	404	if (obj instanceof Character) {
405	return coerce(Short.valueOf((short) ((Character) obj).charValue()));	405	return coerce(Short.valueOf((short) ((Character) obj).charValue()));