Spring/spring-data-gemfire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SGF-473 - Allow a Spring-configured ClientCache to be constructed without a Pool.

Browse Source
This commit is contained in:
John Blum
2016-02-16 18:46:24 -08:00
parent 670973555c
commit b385dbc25e
3 changed files with 168 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/springframework/data/gemfire/client/ClientCacheFactoryBean.java
View File

@@ -18,7 +18,7 @@ package org.springframework.data.gemfire.client;
import java.util.Properties;
import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextRefreshedEvent;
import org.springframework.data.gemfire.CacheFactoryBean;
@@ -202,20 +202,19 @@ public class ClientCacheFactoryBean extends CacheFactoryBean implements Applicat
localPool = PoolManager.find(poolName);
if (localPool == null) {
try {
if (StringUtils.hasText(poolName) && getBeanFactory().isTypeMatch(poolName, Pool.class)) {
localPool = getBeanFactory().getBean(poolName, Pool.class);
}
else {
if (StringUtils.hasText(poolName) && getBeanFactory().isTypeMatch(poolName, Pool.class)) {
localPool = getBeanFactory().getBean(poolName, Pool.class);
}
else {
try {
localPool = getBeanFactory().getBean(Pool.class);
this.poolName = localPool.getName();
}
}
catch (Exception e) {
throw new BeanInitializationException(String.format(
"no bean of type '%1$s' having name '%2$s' was found%3$s", Pool.class.getName(), poolName,
(GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME.equals(poolName)
? "; a ClientCache requires a Pool" : "")), e);
catch (BeansException ignore) {
log.info(String.format("no bean of type '%1$s' having name '%2$s' was found",
Pool.class.getName(), (StringUtils.hasText(poolName) ? poolName
: GemfireConstants.DEFAULT_GEMFIRE_POOL_NAME)));
}
}
}
}