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

Issue: SPR-9869

Author: jhoeller

org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OpDivide.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");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
  * Implements division operator.
  *
  * @author Andy Clement
+ * @author Juergen Hoeller
  * @since 3.0
  */
 public class OpDivide extends Operator {
@@ -42,14 +43,16 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 			Number op2 = (Number) operandTwo;
 			if (op1 instanceof Double || op2 instanceof Double) {
 				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());
-			} 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());
 			}
 		}
-		Object result = state.operate(Operation.DIVIDE, operandOne, operandTwo);
-		return new TypedValue(result);
+		return state.operate(Operation.DIVIDE, operandOne, operandTwo);
 	}
 
 }

org.springframework.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");
  * you may not use this file except in compliance with the License.
@@ -22,34 +22,38 @@
 import org.springframework.expression.spel.ExpressionState;
 
 /**
- * Implements the multiply operator. Conversions and promotions:
- * http://java.sun.com/docs/books/jls/third_edition/html/conversions.html Section 5.6.2:
+ * Implements the {@code multiply} operator.
  *
- * <p>If any of the operands is of a reference type, unboxing conversion (¤5.1.8) is performed. Then:<br>
+ * <p>Conversions and promotions are handled as defined in 
+ * <a href="http://java.sun.com/docs/books/jls/third_edition/html/conversions.html">Section 5.6.2
+ * of the Java Language Specification</a>:
+ *
+ * <p>If any of the operands is of a reference type, unboxing conversion (Section 5.1.8) is performed. Then:<br>
  * If either operand is of type double, the other is converted to double.<br>
  * Otherwise, if either operand is of type float, the other is converted to float.<br>
  * Otherwise, if either operand is of type long, the other is converted to long.<br>
  * Otherwise, both operands are converted to type int.
  *
- * <p>
- *
  * @author Andy Clement
+ * @author Sam Brannen
  * @since 3.0
  */
 public class OpMultiply extends Operator {
 
-
 	public OpMultiply(int pos, SpelNodeImpl... operands) {
 		super("*", pos, operands);
 	}
 
 	/**
-	 * Implements multiply directly here for some types of operand, otherwise delegates to any registered overloader for
-	 * types it does not recognize. Supported types here are:
+	 * Implements the {@code multiply} operator directly here for certain types
+	 * of supported operands and otherwise delegates to any registered overloader
+	 * for types not supported here.
+	 * <p>Supported operand types:
 	 * <ul>
-	 * <li>integers
 	 * <li>doubles
-	 * <li>string and int ('abc' * 2 == 'abcabc')
+	 * <li>longs
+	 * <li>integers
+	 * <li>String and int ('abc' * 2 == 'abcabc')
 	 * </ul>
 	 */
 	@Override
@@ -61,12 +65,15 @@ public TypedValue getValueInternal(ExpressionState state) throws EvaluationExcep
 			Number rightNumber = (Number) operandTwo;
 			if (leftNumber instanceof Double || rightNumber instanceof Double) {
 				return new TypedValue(leftNumber.doubleValue() * rightNumber.doubleValue());
-			} else if (leftNumber instanceof Long || rightNumber instanceof Long) {
+			}
+			else if (leftNumber instanceof Long || rightNumber instanceof Long) {
 				return new TypedValue(leftNumber.longValue() * rightNumber.longValue());
-			} else {
+			}
+			else {
 				return new TypedValue(leftNumber.intValue() * rightNumber.intValue());
 			}
-		} else if (operandOne instanceof String && operandTwo instanceof Integer) {
+		}
+		else if (operandOne instanceof String && operandTwo instanceof Integer) {
 			int repeats = (Integer) operandTwo;
 			StringBuilder result = new StringBuilder();
 			for (int i = 0; i < repeats; i++) {