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

(-)java/org/apache/el/lang/ELArithmetic.java (-8 / +24 lines)
Lines 257-264 Link Here
257
        final ELArithmetic delegate;
257
        final ELArithmetic delegate;
258
        if (BIGDECIMAL.matches(obj0, obj1))
258
        if (BIGDECIMAL.matches(obj0, obj1))
259
            delegate = BIGDECIMAL;
259
            delegate = BIGDECIMAL;
260
        else if (DOUBLE.matches(obj0, obj1))
260
        else if (DOUBLE.matches(obj0, obj1)) {
261
            if (BIGINTEGER.matches(obj0, obj1))
262
                delegate = BIGDECIMAL;
263
            else
261
            delegate = DOUBLE;
264
                delegate = DOUBLE;
265
        }
262
        else if (BIGINTEGER.matches(obj0, obj1))
266
        else if (BIGINTEGER.matches(obj0, obj1))
263
            delegate = BIGINTEGER;
267
            delegate = BIGINTEGER;
264
        else
268
        else
Lines 278-285 Link Here
278
        final ELArithmetic delegate;
282
        final ELArithmetic delegate;
279
        if (BIGDECIMAL.matches(obj0, obj1))
283
        if (BIGDECIMAL.matches(obj0, obj1))
280
            delegate = BIGDECIMAL;
284
            delegate = BIGDECIMAL;
281
        else if (DOUBLE.matches(obj0, obj1))
285
        else if (DOUBLE.matches(obj0, obj1)) {
286
            if (BIGINTEGER.matches(obj0, obj1))
287
                delegate = BIGDECIMAL;
288
            else
282
            delegate = DOUBLE;
289
                delegate = DOUBLE;
290
        }
283
        else if (BIGINTEGER.matches(obj0, obj1))
291
        else if (BIGINTEGER.matches(obj0, obj1))
284
            delegate = BIGINTEGER;
292
            delegate = BIGINTEGER;
285
        else
293
        else
Lines 299-306 Link Here
299
        final ELArithmetic delegate;
307
        final ELArithmetic delegate;
300
        if (BIGDECIMAL.matches(obj0, obj1))
308
        if (BIGDECIMAL.matches(obj0, obj1))
301
            delegate = BIGDECIMAL;
309
            delegate = BIGDECIMAL;
302
        else if (DOUBLE.matches(obj0, obj1))
310
        else if (DOUBLE.matches(obj0, obj1)) {
311
            if (BIGINTEGER.matches(obj0, obj1))
312
                delegate = BIGDECIMAL;
313
            else
303
            delegate = DOUBLE;
314
                delegate = DOUBLE;
315
        }
304
        else if (BIGINTEGER.matches(obj0, obj1))
316
        else if (BIGINTEGER.matches(obj0, obj1))
305
            delegate = BIGINTEGER;
317
            delegate = BIGINTEGER;
306
        else
318
        else
Lines 339-346 Link Here
339
        final ELArithmetic delegate;
351
        final ELArithmetic delegate;
340
        if (BIGDECIMAL.matches(obj0, obj1))
352
        if (BIGDECIMAL.matches(obj0, obj1))
341
            delegate = BIGDECIMAL;
353
            delegate = BIGDECIMAL;
342
        else if (DOUBLE.matches(obj0, obj1))
354
        else if (DOUBLE.matches(obj0, obj1)) {
355
            if (BIGINTEGER.matches(obj0, obj1))
356
                delegate = BIGDECIMAL;
357
            else
343
            delegate = DOUBLE;
358
                delegate = DOUBLE;
359
        }
344
        else if (BIGINTEGER.matches(obj0, obj1))
360
        else if (BIGINTEGER.matches(obj0, obj1))
345
            delegate = BIGINTEGER;
361
            delegate = BIGINTEGER;
346
        else
362
        else

Return to bug 50500