From 30bed7b54a11349bd831024b30cc0cf7e4250baf Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@vmware.com>
Date: Wed, 8 Apr 2009 04:49:47 +0000
Subject: [PATCH] Corrected exception message inserts

---
 .../org/springframework/expression/spel/ExpressionState.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
index b77825191e..770e483587 100644
--- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
+++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ExpressionState.java
@@ -154,7 +154,9 @@ public class ExpressionState {
 			return new TypedValue(returnValue,TypeDescriptor.forObject(returnValue));
 		}
 		else {
-			throw new SpelException(SpelMessages.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES, op, left, right);
+			String leftType = (left==null?"null":left.getClass().getName());
+			String rightType = (right==null?"null":right.getClass().getName());
+			throw new SpelException(SpelMessages.OPERATOR_NOT_SUPPORTED_BETWEEN_TYPES, op, leftType, rightType);
 		}
 	}