Repository: incubator-ignite Updated Branches: refs/heads/ignite-51 e47209d6a -> 5a3afdc0f
#ignite-51: fix GridCacheSwapSelfTest.testSwapDeployment. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1ba48774 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1ba48774 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1ba48774 Branch: refs/heads/ignite-51 Commit: 1ba48774cb9cb270d93177fe1da94e5717761aa5 Parents: c3416bc Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Mar 5 14:20:53 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Mar 5 14:20:53 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/CacheObjectImpl.java | 3 ++- .../ignite/internal/processors/cache/GridCacheAdapter.java | 9 --------- .../internal/processors/cache/KeyCacheObjectImpl.java | 2 +- 3 files changed, 3 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ba48774/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java index ebc5de7..76f5d70 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java @@ -59,7 +59,8 @@ public class CacheObjectImpl extends CacheObjectAdapter { if (byteArray()) return (T)Arrays.copyOf(bytes, bytes.length); else - return (T)ctx.processor().unmarshal(ctx, valBytes, ctx.kernalContext().config().getClassLoader()); + return (T)ctx.processor().unmarshal(ctx, valBytes, + val == null ? ctx.kernalContext().config().getClassLoader() : val.getClass().getClassLoader()); } if (val != null) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ba48774/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 44890f7..f727fbc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -5319,15 +5319,6 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, boolean deserializePortable) { String taskName = ctx.kernalContext().job().currentTaskName(); -// TODO IGNITE-51. -// if (ctx.portableEnabled() && !F.isEmpty(keys)) { -// keys = F.viewReadOnly(keys, new C1<K, K>() { -// @Override public K apply(K k) { -// return (K)ctx.marshalToPortable(k); -// } -// }); -// } - return getAllAsync(keys, !ctx.config().isReadFromBackup(), /*skip tx*/false, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1ba48774/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java index 91958a3..469237d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/KeyCacheObjectImpl.java @@ -87,7 +87,7 @@ public class KeyCacheObjectImpl extends CacheObjectAdapter implements KeyCacheOb try { return (T)ctx.processor().unmarshal(ctx, valBytes, - ctx.kernalContext().config().getClassLoader()); + val.getClass().getClassLoader()); } catch (IgniteCheckedException e) { throw new IgniteException("Failed to unmarshal object.", e);
