ignite-1.6.9 - Fixing tests
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f447559e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f447559e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f447559e Branch: refs/heads/ignite-2788 Commit: f447559ecba55149452e4e48e2bf44ef1fa1b4d7 Parents: 22dc2c9 Author: Alexey Goncharuk <[email protected]> Authored: Thu Sep 29 17:10:14 2016 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Thu Sep 29 17:10:14 2016 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtCacheAdapter.java | 12 ------------ .../cache/distributed/near/GridNearCacheAdapter.java | 9 ++------- 2 files changed, 2 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f447559e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java index 8ced02f..35e6267 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java @@ -261,18 +261,6 @@ public abstract class GridDhtCacheAdapter<K, V> extends GridDistributedCacheAdap */ public abstract GridNearCacheAdapter<K, V> near(); - /** {@inheritDoc} */ - @Override public void forceKeyCheck() { - if (!keyCheck) { - super.forceKeyCheck(); - - GridNearCacheAdapter near = near(); - - if (near != null) - near.forceKeyCheck(); - } - } - /** * @return Partition topology. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f447559e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java index 6acf48e..4ddad74 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java @@ -116,14 +116,9 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda /** {@inheritDoc} */ @Override public void forceKeyCheck() { - if (!keyCheck) { - super.forceKeyCheck(); + super.forceKeyCheck(); - GridDhtCacheAdapter dht = dht(); - - if (dht != null) - dht.forceKeyCheck(); - } + dht().forceKeyCheck(); } /** {@inheritDoc} */
