You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/10/06 10:48:17 UTC
[20/50] [abbrv] ignite git commit: GridNearCacheAdapter,
GridDhtCacheAdapter - test fix
GridNearCacheAdapter, GridDhtCacheAdapter - test fix
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/22dc2c9e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/22dc2c9e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/22dc2c9e
Branch: refs/heads/ignite-3443
Commit: 22dc2c9e05e5183f838865023c9cb7a8291ac67f
Parents: ad613af
Author: Alexander Paschenko <al...@gmail.com>
Authored: Thu Sep 29 15:43:20 2016 +0300
Committer: Alexander Paschenko <al...@gmail.com>
Committed: Thu Sep 29 15:43:59 2016 +0300
----------------------------------------------------------------------
.../cache/distributed/dht/GridDhtCacheAdapter.java | 12 ++++++++++++
.../cache/distributed/near/GridNearCacheAdapter.java | 12 ++++++++++++
2 files changed, 24 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/22dc2c9e/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 35e6267..8ced02f 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,6 +261,18 @@ 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/22dc2c9e/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 dd66a33..6acf48e 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
@@ -115,6 +115,18 @@ public abstract class GridNearCacheAdapter<K, V> extends GridDistributedCacheAda
public abstract GridDhtCacheAdapter<K, V> dht();
/** {@inheritDoc} */
+ @Override public void forceKeyCheck() {
+ if (!keyCheck) {
+ super.forceKeyCheck();
+
+ GridDhtCacheAdapter dht = dht();
+
+ if (dht != null)
+ dht.forceKeyCheck();
+ }
+ }
+
+ /** {@inheritDoc} */
@Override public void onReconnected() {
map = new GridCacheConcurrentMapImpl(
ctx,