From 1746cc76d1c5c1388cd516351d51d83b10f27291 Mon Sep 17 00:00:00 2001
From: Andy Clement <aclement@vmware.com>
Date: Wed, 27 May 2009 19:22:53 +0000
Subject: [PATCH] findbugs issue addressed

---
 .../springframework/expression/spel/ast/Projection.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
index 50ed7d94ea..5a4f2d46f1 100644
--- a/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
+++ b/org.springframework.expression/src/main/java/org/springframework/expression/spel/ast/Projection.java
@@ -88,8 +88,12 @@ public class Projection extends SpelNodeImpl {
 			}
 			return new TypedValue(result,op.getTypeDescriptor());
 		} else {
-			if (operand==null && nullSafe) {
-				return TypedValue.NULL_TYPED_VALUE;
+			if (operand==null) {
+				if (nullSafe) {
+					return TypedValue.NULL_TYPED_VALUE;
+				} else {					
+					throw new SpelEvaluationException(getStartPosition(),SpelMessages.PROJECTION_NOT_SUPPORTED_ON_TYPE, "null");
+				}
 			} else {
 				throw new SpelEvaluationException(getStartPosition(),SpelMessages.PROJECTION_NOT_SUPPORTED_ON_TYPE, operand.getClass().getName());
 			}