From 39f1536d5ac9c31e9590ae3bc0b64a38e96875f8 Mon Sep 17 00:00:00 2001
From: Luke Taylor <luke.taylor@springsource.com>
Date: Thu, 7 May 2009 08:24:41 +0000
Subject: [PATCH] Upgrade to Spring 3.0 M3

---
 .../support/DefaultMethodSecurityExpressionHandler.java       | 4 ++--
 pom.xml                                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java b/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java
index 7e6cda029b..c8158c2820 100644
--- a/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java
+++ b/core/src/main/java/org/springframework/security/access/expression/support/DefaultMethodSecurityExpressionHandler.java
@@ -58,7 +58,7 @@ public class DefaultMethodSecurityExpressionHandler implements MethodSecurityExp
 
     @SuppressWarnings("unchecked")
     public Object filter(Object filterTarget, Expression filterExpression, EvaluationContext ctx) {
-        MethodSecurityExpressionRoot rootObject = (MethodSecurityExpressionRoot) ctx.getRootObject();
+        MethodSecurityExpressionRoot rootObject = (MethodSecurityExpressionRoot) ctx.getRootObject().getValue();
         List retainList;
 
         if (logger.isDebugEnabled()) {
@@ -139,7 +139,7 @@ public class DefaultMethodSecurityExpressionHandler implements MethodSecurityExp
     }
 
     public void setReturnObject(Object returnObject, EvaluationContext ctx) {
-        ((MethodSecurityExpressionRoot)ctx.getRootObject()).setReturnObject(returnObject);
+        ((MethodSecurityExpressionRoot)ctx.getRootObject().getValue()).setReturnObject(returnObject);
     }
 
 }
diff --git a/pom.xml b/pom.xml
index a4794f62a7..d59163992b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -841,7 +841,7 @@
         </dependencies>
     </dependencyManagement>
     <properties>
-        <spring.version>3.0.0.M2</spring.version>
+        <spring.version>3.0.0.M3</spring.version>
         <jstl.version>1.1.2</jstl.version>
         <jetty.version>6.1.15</jetty.version>