OpDivide does not return a TypedValue for its operate result (consistent with OpMultiply)

Issue: SPR-9869
master
Juergen Hoeller 12 years ago committed by unknown
parent ff7dcec5f7
commit 138fa8af0e
  1. 13
      spring-expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.java
  2. 3
      spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2009 the original author or authors. * Copyright 2002-2012 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -25,6 +25,7 @@ import org.springframework.expression.spel.ExpressionState;
* Implements division operator. * Implements division operator.
* *
* @author Andy Clement * @author Andy Clement
* @author Juergen Hoeller
* @since 3.0 * @since 3.0
*/ */
public class OpDivide extends Operator { public class OpDivide extends Operator {
@ -42,14 +43,16 @@ public class OpDivide extends Operator {
Number op2 = (Number) operandTwo; Number op2 = (Number) operandTwo;
if (op1 instanceof Double || op2 instanceof Double) { if (op1 instanceof Double || op2 instanceof Double) {
return new TypedValue(op1.doubleValue() / op2.doubleValue()); return new TypedValue(op1.doubleValue() / op2.doubleValue());
} else if (op1 instanceof Long || op2 instanceof Long) { }
else if (op1 instanceof Long || op2 instanceof Long) {
return new TypedValue(op1.longValue() / op2.longValue()); return new TypedValue(op1.longValue() / op2.longValue());
} else { // TODO what about non-int result of the division? }
else {
// TODO what about non-int result of the division?
return new TypedValue(op1.intValue() / op2.intValue()); return new TypedValue(op1.intValue() / op2.intValue());
} }
} }
Object result = state.operate(Operation.DIVIDE, operandOne, operandTwo); return state.operate(Operation.DIVIDE, operandOne, operandTwo);
return new TypedValue(result);
} }
} }

@ -48,13 +48,12 @@ public class OpMultiply extends Operator {
* Implements the {@code multiply} operator directly here for certain types * Implements the {@code multiply} operator directly here for certain types
* of supported operands and otherwise delegates to any registered overloader * of supported operands and otherwise delegates to any registered overloader
* for types not supported here. * for types not supported here.
*
* <p>Supported operand types: * <p>Supported operand types:
* <ul> * <ul>
* <li>doubles * <li>doubles
* <li>longs * <li>longs
* <li>integers * <li>integers
* <li>string and int ('abc' * 2 == 'abcabc') * <li>String and int ('abc' * 2 == 'abcabc')
* </ul> * </ul>
*/ */
@Override @Override

Loading…
Cancel
Save