OpDivide does not return a TypedValue for its operate result (consist…

…ent with OpMultiply)

Issue: SPR-9869

spring-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);
 	}
 
 }

spring-expression/src/main/java/org/springframework/expression/spel/ast/OpMultiply.java

@@ -48,13 +48,12 @@ public OpMultiply(int pos, SpelNodeImpl... operands) {
 	 * 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>doubles
 	 * <li>longs
 	 * <li>integers
-	 * <li>string and int ('abc' * 2 == 'abcabc')
+	 * <li>String and int ('abc' * 2 == 'abcabc')
 	 * </ul>
 	 */
 	@Override