# ignite-571
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6924f0fa Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6924f0fa Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6924f0fa Branch: refs/heads/ignite-639 Commit: 6924f0fa92f8c812182f3b9977b7dba1d16ac8ea Parents: 4138890 Author: sboikov <sboi...@gridgain.com> Authored: Mon Apr 6 12:01:22 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Mon Apr 6 12:01:22 2015 +0300 ---------------------------------------------------------------------- .../distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java | 2 +- .../cache/distributed/near/GridCacheNearEvictionSelfTest.java | 2 +- .../near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java | 4 ++-- .../src/main/java/org/apache/ignite/yardstick/IgniteNode.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java index 99b95ce..442f598 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridCacheDhtEvictionNearReadersSelfTest.java @@ -83,7 +83,7 @@ public class GridCacheDhtEvictionNearReadersSelfTest extends GridCommonAbstractT nearCfg.setNearEvictionPolicy(new FifoEvictionPolicy(10)); - cfg.setNearCacheConfiguration(nearCfg); + cacheCfg.setNearConfiguration(nearCfg); cfg.setCacheConfiguration(cacheCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java index 4b1c933..ec3a3e4 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearEvictionSelfTest.java @@ -62,7 +62,7 @@ public class GridCacheNearEvictionSelfTest extends GridCommonAbstractTest { NearCacheConfiguration nearCfg = new NearCacheConfiguration(); - c.setNearCacheConfiguration(nearCfg); + cc.setNearConfiguration(nearCfg); c.setCacheConfiguration(cc); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java index 0b86d52..05eab37 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCachePartitionedBasicStoreMultiNodeSelfTest.java @@ -106,9 +106,9 @@ public class GridCachePartitionedBasicStoreMultiNodeSelfTest extends GridCommonA cc.setWriteThrough(true); cc.setLoadPreviousValue(true); - c.setCacheConfiguration(cc); + cc.setNearConfiguration(nearCacheConfiguration()); - c.setNearCacheConfiguration(nearCacheConfiguration()); + c.setCacheConfiguration(cc); return c; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6924f0fa/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java index ad6cffa..8638623 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/IgniteNode.java @@ -79,7 +79,7 @@ public class IgniteNode implements BenchmarkServer { c.setClientMode(true); if (args.isNearCache()) - c.setNearCacheConfiguration(new NearCacheConfiguration()); + cc.setNearConfiguration(new NearCacheConfiguration()); cc.setWriteSynchronizationMode(args.syncMode());