Repository: incubator-ignite Updated Branches: refs/heads/ignite-45 b401c0e0d -> 4426dded5
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/96709cef Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/96709cef Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/96709cef Branch: refs/heads/ignite-45 Commit: 96709cefd649088c0fe199b87fc2cef06dd0f6bd Parents: 4bd4642 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Mar 24 00:41:38 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Mar 24 00:41:38 2015 -0700 ---------------------------------------------------------------------- .../cache/distributed/dht/GridDhtLockFuture.java | 2 +- .../processors/cache/GridCacheLifecycleAwareSelfTest.java | 10 +++++----- .../junits/common/GridAbstractLifecycleAwareSelfTest.java | 7 +++++++ 3 files changed, 13 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96709cef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java index 9680582..ed61814 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java @@ -929,7 +929,7 @@ public final class GridDhtLockFuture<K, V> extends GridCompoundIdentityFuture<Bo * */ private void loadMissingFromStore() { - if (cctx.loadPreviousValue() && cctx.readThrough()) { + if (cctx.loadPreviousValue() && cctx.readThrough() && read) { final Map<KeyCacheObject, GridDhtCacheEntry> loadMap = new LinkedHashMap<>(); final GridCacheVersion ver = version(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96709cef/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java index 17c02fb..9b1e445 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheLifecycleAwareSelfTest.java @@ -31,8 +31,8 @@ import org.apache.ignite.testframework.junits.common.*; import org.jetbrains.annotations.*; import javax.cache.*; -import javax.cache.configuration.*; import javax.cache.integration.*; +import java.io.*; import java.util.*; import static org.apache.ignite.cache.CacheMode.*; @@ -117,10 +117,10 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** */ - private static class TestAffinityFunction extends TestLifecycleAware implements CacheAffinityFunction { + public static class TestAffinityFunction extends TestLifecycleAware implements CacheAffinityFunction { /** */ - TestAffinityFunction() { + public TestAffinityFunction() { super(CACHE_NAME); } @@ -161,10 +161,10 @@ public class GridCacheLifecycleAwareSelfTest extends GridAbstractLifecycleAwareS /** */ - private static class TestEvictionPolicy extends TestLifecycleAware implements CacheEvictionPolicy { + public static class TestEvictionPolicy extends TestLifecycleAware implements CacheEvictionPolicy, Serializable { /** */ - TestEvictionPolicy() { + public TestEvictionPolicy() { super(CACHE_NAME); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/96709cef/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java index a41053b..21455ef 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridAbstractLifecycleAwareSelfTest.java @@ -49,6 +49,13 @@ public abstract class GridAbstractLifecycleAwareSelfTest extends GridCommonAbstr private final String expCacheName; /** + * + */ + public TestLifecycleAware() { + expCacheName = null; + } + + /** * @param expCacheName Expected injected cache name. */ public TestLifecycleAware(String expCacheName) {
