Repository: ignite Updated Branches: refs/heads/ignite-950-new c0837b466 -> ce235eaca
IGNITE-950-new - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce235eac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce235eac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce235eac Branch: refs/heads/ignite-950-new Commit: ce235eacac13c1e63333255a96278575010a7fc1 Parents: c0837b4 Author: Alexey Goncharuk <[email protected]> Authored: Sat Oct 31 15:43:44 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Sat Oct 31 15:43:44 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/near/GridNearGetFuture.java | 14 +++++++++++--- ...cheAbstractDistributedByteArrayValuesSelfTest.java | 4 ++++ 2 files changed, 15 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ce235eac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java index 1f65e66..79ab8bb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java @@ -530,10 +530,18 @@ public final class GridNearGetFuture<K, V> extends CacheDistributedGetFutureAdap add(new GridFinishedFuture<>(Collections.singletonMap((K)key, val0))); } else { - K key0 = (K)cctx.unwrapPortableIfNeeded(key, !deserializePortable); - V val0 = (V)cctx.unwrapPortableIfNeeded(v, !deserializePortable); + if (keepCacheObjects) { + K key0 = (K)key; + V val0 = (V)(skipVals ? true : v); - add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0))); + add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0))); + } + else { + K key0 = (K)cctx.unwrapPortableIfNeeded(key, !deserializePortable); + V val0 = (V)cctx.unwrapPortableIfNeeded(v, !deserializePortable); + + add(new GridFinishedFuture<>(Collections.singletonMap(key0, val0))); + } } } else { http://git-wip-us.apache.org/repos/asf/ignite/blob/ce235eac/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 29d9387..fde16ec 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 @@ -336,6 +336,8 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend private void testTransactionMixed0(IgniteCache<Integer, Object>[] caches, TransactionConcurrency concurrency, Integer key1, byte[] val1, @Nullable Integer key2, @Nullable Object val2) throws Exception { for (IgniteCache<Integer, Object> cache : caches) { + info("Checking cache: " + cache.getName()); + Transaction tx = cache.unwrap(Ignite.class).transactions().txStart(concurrency, REPEATABLE_READ); try { @@ -351,6 +353,8 @@ public abstract class GridCacheAbstractDistributedByteArrayValuesSelfTest extend } for (IgniteCache<Integer, Object> cacheInner : caches) { + info("Getting value from cache: " + cacheInner.getName()); + tx = cacheInner.unwrap(Ignite.class).transactions().txStart(concurrency, REPEATABLE_READ); try {
