cc
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2c68adb8 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2c68adb8 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2c68adb8 Branch: refs/heads/ignite-5075-cc-debug Commit: 2c68adb8dfb206640c86c24cebc899cf2c18f690 Parents: 52b716b Author: sboikov <[email protected]> Authored: Thu May 25 13:11:51 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu May 25 13:11:51 2017 +0300 ---------------------------------------------------------------------- .../cache/query/continuous/CacheContinuousQueryHandler.java | 2 -- .../CacheContinuousQueryFailoverAbstractSelfTest.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2c68adb8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java index 9866e7b..11ed922 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryHandler.java @@ -458,8 +458,6 @@ public class CacheContinuousQueryHandler<K, V> implements GridContinuousHandler for (CacheContinuousQueryEntry e : backupQueue) { if (!e.isFiltered()) prepareEntry(cctx, nodeId, e); - - e.topologyVersion(topVer); } ctx.continuous().addBackupNotification(nodeId, routineId, backupQueue, topic); http://git-wip-us.apache.org/repos/asf/ignite/blob/2c68adb8/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java index 3108edc..2fb7fcb 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFailoverAbstractSelfTest.java @@ -30,6 +30,7 @@ import java.util.UUID; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.CyclicBarrier; import java.util.concurrent.ThreadLocalRandom; @@ -2421,7 +2422,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC private ConcurrentHashMap<Object, CacheEntryEvent<?, ?>> evts = new ConcurrentHashMap<>(); /** */ - private List<CacheEntryEvent<?, ?>> allEvts; + private final CopyOnWriteArrayList<CacheEntryEvent<?, ?>> allEvts; /** */ @LoggerResource @@ -2431,8 +2432,7 @@ public abstract class CacheContinuousQueryFailoverAbstractSelfTest extends GridC * @param saveAll Save all events flag. */ CacheEventListener1(boolean saveAll) { - if (saveAll) - allEvts = new ArrayList<>(); + allEvts = saveAll ? new CopyOnWriteArrayList<CacheEntryEvent<?, ?>>() : null; } /** {@inheritDoc} */
