SGF-186 - fixed BeanFactoryLocator issue

2013-07-11 16:01:57 -04:00
parent 36df54e5b5
commit 6b523a064e
5 changed files with 78 additions and 19 deletions
--- a/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
+++ b/src/main/java/org/springframework/data/gemfire/CacheFactoryBean.java
@@ -241,8 +241,8 @@ public class CacheFactoryBean implements BeanNameAware, BeanFactoryAware, BeanCl
 	protected Object gatewayConflictResolver;

 	private void init() throws Exception {
-		// initialize locator
-		if (useBeanFactoryLocator) {
+
+		if (useBeanFactoryLocator && factoryLocator == null) {
 			factoryLocator = new GemfireBeanFactoryLocator();
 			factoryLocator.setBeanFactory(beanFactory);
 			factoryLocator.setBeanName(beanName);