Răsfoiți Sursa

Upgrade to Spring 3.0 M3

Luke Taylor 16 ani în urmă
părinte
comite
39f1536d5a

+ 2 - 2
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);
     }
 
 }

+ 1 - 1
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>