#IGNITE-96 Fixed testSwap.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7f6091bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7f6091bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7f6091bc Branch: refs/heads/sprint-1 Commit: 7f6091bc2e0ed3e7a2ddb4535c09d97d14a12132 Parents: 7e8b6c7 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Wed Feb 11 13:09:16 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Wed Feb 11 13:09:16 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheSwapManager.java | 2 +- .../GridCacheAbstractDistributedByteArrayValuesSelfTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f6091bc/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index 2f9e9fb..d833863 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -820,7 +820,7 @@ public class GridCacheSwapManager<K, V> extends GridCacheManagerAdapter<K, V> { GridCacheBatchSwapEntry<K, V> unswapped = new GridCacheBatchSwapEntry<>(key, swapKey.keyBytes(), swapKey.partition(), - ByteBuffer.wrap(entry.valueBytes()), + entry.valueIsByteArray() ? null : ByteBuffer.wrap(entry.valueBytes()), entry.valueIsByteArray(), entry.version(), entry.ttl(), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7f6091bc/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java index 0333c19..eae37e9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheAbstractDistributedByteArrayValuesSelfTest.java @@ -282,7 +282,7 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend for (IgniteCache<Integer, Object> cache : caches) { Ignite ignite = ignites[i++]; - if (ignite.affinity(null).isPrimary(ignite.cluster().localNode(), SWAP_TEST_KEY)) { + if (affinity(cache).isPrimary(ignite.cluster().localNode(), SWAP_TEST_KEY)) { primaryCache = cache; break;
