From 29fe8da1adf201e325327e8d7a7728e2bc099493 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@vmware.com>
Date: Sun, 17 Aug 2008 01:27:45 +0000
Subject: [PATCH] fixing error handling in 'is' operator

---
 .../expression/spel/ast/OperatorIs.java       | 27 ++++++++++++-------
 .../spel/ParserErrorMessagesTests.java        |  7 +++++
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIs.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIs.java
index 1e9d72592e7..06486ae717f 100644
--- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIs.java
+++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/OperatorIs.java
@@ -17,19 +17,17 @@ package org.springframework.expression.spel.ast;
 
 import org.antlr.runtime.Token;
 import org.springframework.expression.EvaluationException;
+import org.springframework.expression.spel.ExpressionState;
 import org.springframework.expression.spel.SpelException;
 import org.springframework.expression.spel.SpelMessages;
-import org.springframework.expression.spel.ExpressionState;
 
 /**
  * The operator 'is' checks if an object is of the class specified in the right hand operand, in the same way that
  * instanceof does in Java.
  * 
  * @author Andy Clement
- * 
  */
 public class OperatorIs extends Operator {
-	// TODO should 'is' change to 'instanceof' ?
 
 	public OperatorIs(Token payload) {
 		super(payload);
@@ -40,16 +38,27 @@ public class OperatorIs extends Operator {
 		return "is";
 	}
 
+	/**
+	 * Compare the left operand to see it is an instance of the type specified as the right operand. The right operand
+	 * must be a class.
+	 * 
+	 * @param state the expression state
+	 * @return true if the left operand is an instanceof of the right operand, otherwise false
+	 * @throws EvaluationException if there is a problem evaluating the expression
+	 */
 	@Override
-	public Object getValue(ExpressionState state) throws EvaluationException {
+	public Boolean getValue(ExpressionState state) throws EvaluationException {
 		Object left = getLeftOperand().getValue(state);
 		Object right = getRightOperand().getValue(state);
-		if (!(right instanceof Class<?>)) {
-			throw new SpelException(getRightOperand().getCharPositionInLine(),
-					SpelMessages.IS_OPERATOR_NEEDS_CLASS_OPERAND, right.getClass().getName());
+		if (left == null) {
+			return false; // null is not an instanceof anything
 		}
-		// TODO Could this defer to type utilities? What would be the benefit?
-		return (((Class<?>) right).isAssignableFrom(left.getClass()));
+		if (right == null || !(right instanceof Class<?>)) {
+			throw new SpelException(getRightOperand().getCharPositionInLine(),
+					SpelMessages.IS_OPERATOR_NEEDS_CLASS_OPERAND, (right == null ? "null" : right.getClass().getName()));
+		}
+		Class<?> rightClass = (Class<?>) right;
+		return rightClass.isAssignableFrom(left.getClass());
 	}
 
 }
diff --git a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java
index 078cb5f3132..5abf578d2bf 100644
--- a/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java
+++ b/org.springframework.expression/src/test/java/org/springframework/expression/spel/ParserErrorMessagesTests.java
@@ -56,4 +56,11 @@ public class ParserErrorMessagesTests extends ExpressionTestCase {
 		parseAndCheckError("1;2;3", SpelMessages.PARSE_PROBLEM, 1, "mismatched input ';' expecting EOF"); // POOR
 		evaluate("(1;2;3)", 3, Integer.class);
 	}
+
+	public void testBrokenExpression07() {
+		// T() can only take an identifier (possibly qualified), not a literal
+		// message ought to say identifier rather than ID
+		parseAndCheckError("null is T('a')", SpelMessages.PARSE_PROBLEM, 10, "mismatched input ''a'' expecting ID"); // POOR
+	}
+
 }