From 9c0c87f6a7fac486afee89addc32dd73b16bf211 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 16 Nov 2011 18:23:45 +0000
Subject: [PATCH] Polish AutoProxyRegistrar

---
 .../cache/annotation/ProxyCachingConfiguration.java             | 2 --
 .../springframework/context/annotation/AutoProxyRegistrar.java  | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java b/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
index 2487ab6547..476590beac 100644
--- a/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
+++ b/org.springframework.context/src/main/java/org/springframework/cache/annotation/ProxyCachingConfiguration.java
@@ -21,10 +21,8 @@ import org.springframework.cache.interceptor.BeanFactoryCacheOperationSourceAdvi
 import org.springframework.cache.interceptor.CacheInterceptor;
 import org.springframework.cache.interceptor.CacheOperationSource;
 import org.springframework.context.annotation.AnnotationConfigUtils;
-import org.springframework.context.annotation.AutoProxyRegistrar;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Role;
 
 /**
diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
index f83fb781a0..4f39f7af71 100644
--- a/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
+++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/AutoProxyRegistrar.java
@@ -53,6 +53,7 @@ public class AutoProxyRegistrar implements ImportBeanDefinitionRegistrar {
 					AopConfigUtils.registerAutoProxyCreatorIfNecessary(registry);
 					if ((Boolean)proxyTargetClass) {
 						AopConfigUtils.forceAutoProxyCreatorToUseClassProxying(registry);
+						return;
 					}
 				}
 			}