From 8abf6687d2918f255033306441b6b9118807eed7 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 18 Sep 2020 16:46:47 -0700 Subject: [PATCH] Modify AsyncInlineCachingRegionConfigurer to append to the list of AEQs registered on the Region when configuring Async, Inline Caching. --- .../geode/cache/AsyncInlineCachingRegionConfigurer.java | 3 +-- .../cache/AsyncInlineCachingRegionConfigurerUnitTests.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/spring-geode/src/main/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurer.java b/spring-geode/src/main/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurer.java index abd0260d..23922120 100644 --- a/spring-geode/src/main/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurer.java +++ b/spring-geode/src/main/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurer.java @@ -219,8 +219,7 @@ public class AsyncInlineCachingRegionConfigurer implements RegionConfigur AsyncEventQueue queue = newAsyncEventQueue((Cache) bean.getCache(), beanName); - // TODO: change; PeerRegionFactoryBean.setAsyncEventQueues(..) overwrites the existing user-configured AEQs. - bean.setAsyncEventQueues(ArrayUtils.asArray(queue)); + bean.addAsyncEventQueues(ArrayUtils.asArray(queue)); } } diff --git a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerUnitTests.java b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerUnitTests.java index 9945cc43..b14c1ab9 100644 --- a/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerUnitTests.java +++ b/spring-geode/src/test/java/org/springframework/geode/cache/AsyncInlineCachingRegionConfigurerUnitTests.java @@ -242,7 +242,7 @@ public class AsyncInlineCachingRegionConfigurerUnitTests { verify(regionConfigurer, times(1)) .newAsyncEventQueue(eq(mockCache), eq("TestRegion")); verify(peerRegionFactoryBean, times(1)) - .setAsyncEventQueues(eq(ArrayUtils.asArray(mockAsyncEventQueue))); + .addAsyncEventQueues(eq(ArrayUtils.asArray(mockAsyncEventQueue))); verifyNoMoreInteractions(regionConfigurer, peerRegionFactoryBean); verifyNoInteractions(mockAsyncEventQueue, mockCache, mockRepository);