From b2f470b6f9d7bbf066b462a01d8c3628ff61152d Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <jhoeller@vmware.com>
Date: Thu, 15 Apr 2010 16:13:50 +0000
Subject: [PATCH] fixed canRead breakage

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@3249 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../org/springframework/web/servlet/tags/EvalTag.java     | 4 ++--
 .../springframework/web/servlet/tags/EvalTagTests.java    | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EvalTag.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
index 9365f16c85c..18ac1a90fd6 100644
--- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
+++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/tags/EvalTag.java
@@ -155,8 +155,8 @@ public class EvalTag extends HtmlEscapingAwareTag {
 		}
 
 		public boolean canRead(EvaluationContext context, Object target, String name) throws AccessException {
-			return (target == null && (resolveImplicitVariable(name) != null) ||
-					this.pageContext.findAttribute(name) != null);
+			return (target == null &&
+					(resolveImplicitVariable(name) != null || this.pageContext.findAttribute(name) != null));
 		}
 
 		public TypedValue read(EvaluationContext context, Object target, String name) throws AccessException {
diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
index a2d31405cea..0ae40d9b3c3 100644
--- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
+++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/tags/EvalTagTests.java
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet.tags;
 
 import java.math.BigDecimal;
-
 import javax.servlet.jsp.tagext.Tag;
 
 import org.springframework.format.annotation.NumberFormat;
@@ -26,6 +25,9 @@ import org.springframework.format.support.FormattingConversionServiceFactoryBean
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockPageContext;
 
+/**
+ * @author Keith Donald
+ */
 public class EvalTagTests extends AbstractTagTests {
 
 	private EvalTag tag;
@@ -91,7 +93,7 @@ public class EvalTagTests extends AbstractTagTests {
 	}
 
 	// SPR-6923
-	public void testNestedPropertyWithAttribtueName() throws Exception {
+	public void testNestedPropertyWithAttributeName() throws Exception {
 		tag.setExpression("bean.bean");
 		tag.setVar("foo");
 		int action = tag.doStartTag();
@@ -101,6 +103,7 @@ public class EvalTagTests extends AbstractTagTests {
 		assertEquals("not the bean object", context.getAttribute("foo"));
 	}
 
+
 	public static class Bean {
 		
 		public String method() {
@@ -123,4 +126,5 @@ public class EvalTagTests extends AbstractTagTests {
 			return "function foo() { alert(\"hi\") }";
 		}
 	}
+
 }