mirror of
https://github.com/spring-projects/spring-security.git
synced 2025-07-14 14:23:30 +00:00
Upgrade to Spring 3.0 M3
This commit is contained in:
parent
b3ccee4dbc
commit
39f1536d5a
@ -58,7 +58,7 @@ public class DefaultMethodSecurityExpressionHandler implements MethodSecurityExp
|
|||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public Object filter(Object filterTarget, Expression filterExpression, EvaluationContext ctx) {
|
public Object filter(Object filterTarget, Expression filterExpression, EvaluationContext ctx) {
|
||||||
MethodSecurityExpressionRoot rootObject = (MethodSecurityExpressionRoot) ctx.getRootObject();
|
MethodSecurityExpressionRoot rootObject = (MethodSecurityExpressionRoot) ctx.getRootObject().getValue();
|
||||||
List retainList;
|
List retainList;
|
||||||
|
|
||||||
if (logger.isDebugEnabled()) {
|
if (logger.isDebugEnabled()) {
|
||||||
@ -139,7 +139,7 @@ public class DefaultMethodSecurityExpressionHandler implements MethodSecurityExp
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void setReturnObject(Object returnObject, EvaluationContext ctx) {
|
public void setReturnObject(Object returnObject, EvaluationContext ctx) {
|
||||||
((MethodSecurityExpressionRoot)ctx.getRootObject()).setReturnObject(returnObject);
|
((MethodSecurityExpressionRoot)ctx.getRootObject().getValue()).setReturnObject(returnObject);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
2
pom.xml
2
pom.xml
@ -841,7 +841,7 @@
|
|||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
<properties>
|
<properties>
|
||||||
<spring.version>3.0.0.M2</spring.version>
|
<spring.version>3.0.0.M3</spring.version>
|
||||||
<jstl.version>1.1.2</jstl.version>
|
<jstl.version>1.1.2</jstl.version>
|
||||||
<jetty.version>6.1.15</jetty.version>
|
<jetty.version>6.1.15</jetty.version>
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user