From 50252e228fe4b22811e79ef11000be27208e1b4c Mon Sep 17 00:00:00 2001 From: costin Date: Tue, 31 Aug 2010 14:46:10 +0300 Subject: [PATCH] SGF-15 + allow clients to have no interests registered --- .../data/gemfire/ClientRegionFactoryBean.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/ClientRegionFactoryBean.java b/src/main/java/org/springframework/data/gemfire/ClientRegionFactoryBean.java index 0482480a..9ccfef68 100644 --- a/src/main/java/org/springframework/data/gemfire/ClientRegionFactoryBean.java +++ b/src/main/java/org/springframework/data/gemfire/ClientRegionFactoryBean.java @@ -16,7 +16,7 @@ package org.springframework.data.gemfire; -import org.springframework.util.Assert; +import org.springframework.util.ObjectUtils; import com.gemstone.gemfire.cache.Region; @@ -31,15 +31,15 @@ public class ClientRegionFactoryBean extends RegionFactoryBean { @Override protected void postProcess(Region region) { - Assert.notEmpty(interests); - - for (Interest interest : interests) { - if (interest instanceof RegexInterest) { - // do the cast since it's safe - region.registerInterestRegex((String) interest.getKey(), interest.getPolicy(), interest.isDurable()); - } - else { - region.registerInterest(interest.getKey(), interest.getPolicy(), interest.isDurable()); + if (!ObjectUtils.isEmpty(interests)) { + for (Interest interest : interests) { + if (interest instanceof RegexInterest) { + // do the cast since it's safe + region.registerInterestRegex((String) interest.getKey(), interest.getPolicy(), interest.isDurable()); + } + else { + region.registerInterest(interest.getKey(), interest.getPolicy(), interest.isDurable()); + } } } } @@ -49,7 +49,7 @@ public class ClientRegionFactoryBean extends RegionFactoryBean { Region region = getObject(); // unregister interests try { - if (region != null) { + if (region != null && !ObjectUtils.isEmpty(interests)) { for (Interest interest : interests) { if (interest instanceof RegexInterest) { region.unregisterInterestRegex((String) interest.getKey());