From 7537dfc33a0fa5b8ff69d1c7fbe207101a94acd4 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@vmware.com>
Date: Fri, 20 Sep 2013 15:13:02 -0500
Subject: [PATCH] SEC-2304: rm duplicate MethodExpressionHandler from
 GlobalMethodSecurityConfiguration

---
 .../GlobalMethodSecurityConfiguration.java         | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java
index a161676630..c5815bd8fa 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/method/configuration/GlobalMethodSecurityConfiguration.java
@@ -282,7 +282,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware {
     public MethodSecurityMetadataSource methodSecurityMetadataSource() {
         List<MethodSecurityMetadataSource> sources = new ArrayList<MethodSecurityMetadataSource>();
         ExpressionBasedAnnotationAttributeFactory attributeFactory = new ExpressionBasedAnnotationAttributeFactory(
-                methodExpressionHandler());
+                getExpressionHandler());
         MethodSecurityMetadataSource customMethodSecurityMetadataSource = customMethodSecurityMetadataSource();
         if (customMethodSecurityMetadataSource != null) {
             sources.add(customMethodSecurityMetadataSource);
@@ -300,16 +300,6 @@ public class GlobalMethodSecurityConfiguration implements ImportAware {
         return new DelegatingMethodSecurityMetadataSource(sources);
     }
 
-    /**
-     * Creates the {@link MethodSecurityExpressionHandler} to be used.
-     *
-     * @return
-     */
-    @Bean
-    public MethodSecurityExpressionHandler methodExpressionHandler() {
-        return new DefaultMethodSecurityExpressionHandler();
-    }
-
     /**
      * Creates the {@link PreInvocationAuthorizationAdvice} to be used. The
      * default is {@link ExpressionBasedPreInvocationAdvice}.
@@ -319,7 +309,7 @@ public class GlobalMethodSecurityConfiguration implements ImportAware {
     @Bean
     public PreInvocationAuthorizationAdvice preInvocationAuthorizationAdvice() {
         ExpressionBasedPreInvocationAdvice preInvocationAdvice = new ExpressionBasedPreInvocationAdvice();
-        preInvocationAdvice.setExpressionHandler(methodExpressionHandler());
+        preInvocationAdvice.setExpressionHandler(getExpressionHandler());
         return preInvocationAdvice;
     }