Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 2fd6e2608 -> ad1a0ab10
IGNITE-45 - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ad1a0ab1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ad1a0ab1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ad1a0ab1 Branch: refs/heads/ignite-45 Commit: ad1a0ab101cd5a2119976b93fd671563c6ca46fe Parents: 2fd6e26 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Thu Mar 19 19:16:37 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Thu Mar 19 19:16:37 2015 -0700 ---------------------------------------------------------------------- .../configuration/NearCacheConfiguration.java | 22 -------------------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- 2 files changed, 1 insertion(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad1a0ab1/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java index 1f49f1b..7e42b56 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/NearCacheConfiguration.java @@ -35,9 +35,6 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> { /** Cache name. */ private String name; - /** Near enabled flag. */ - private boolean nearEnabled; - /** Near cache eviction policy. */ private CacheEvictionPolicy<K, V> nearEvictPlc; @@ -58,7 +55,6 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> { super(ccfg); name = ccfg.getName(); - nearEnabled = ccfg.isNearEnabled(); nearEvictPlc = ccfg.getNearEvictionPolicy(); nearStartSize = ccfg.getNearStartSize(); } @@ -82,24 +78,6 @@ public class NearCacheConfiguration<K, V> extends MutableConfiguration<K, V> { } /** - * Gets near enabled flag. - * - * @return Near enabled flag. - */ - public boolean isNearEnabled() { - return nearEnabled; - } - - /** - * Sets near enabled flag. - * - * @param nearEnabled Near enabled flag. - */ - public void setNearEnabled(boolean nearEnabled) { - this.nearEnabled = nearEnabled; - } - - /** * @return Near eviction policy. */ public CacheEvictionPolicy<K, V> getNearEvictionPolicy() { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ad1a0ab1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index ec75448..9f69f0e 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -646,7 +646,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> onDone(err); - throw err; + return; } } else if (conflictPutVals != null) {
