IGNITE-471 - Fixed compilation
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9020b0c8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9020b0c8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9020b0c8 Branch: refs/heads/ignite-471 Commit: 9020b0c88e331d82818e48217a40e5e8201fdcdf Parents: fda23f8 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Wed Apr 1 18:59:50 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Wed Apr 1 18:59:50 2015 -0700 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheMapEntry.java | 1 - .../processors/cacheobject/IgniteCacheObjectProcessorImpl.java | 6 +++--- .../optimized/OptimizedMarshallerNodeFailoverTest.java | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9020b0c8/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index f9fc502..812d673 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -3680,7 +3680,6 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx { if (qryMgr != null && qryMgr.enabled()) { qryMgr.store( key.value(cctx.cacheObjectContext(), false), - null, CU.value(val, cctx, false), null, ver, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9020b0c8/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java index 68de90e..9132e1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cacheobject/IgniteCacheObjectProcessorImpl.java @@ -331,7 +331,7 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme * @param val Value. * @param valBytes Value bytes. */ - public UserCacheObjectImpl(Object val, byte[] valBytes) { + public UserCacheObjectImpl(Object val, ByteBuffer valBytes) { super(val, valBytes); } @@ -344,13 +344,13 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter impleme @Override public CacheObject prepareForCache(CacheObjectContext ctx) { try { if (valBytes == null) - valBytes = ctx.processor().marshal(ctx, val); + valBytes = ctx.marshal(val); if (ctx.storeValue()) { ClassLoader ldr = ctx.p2pEnabled() ? IgniteUtils.detectClass(this.val).getClassLoader() : val.getClass().getClassLoader(); - Object val = ctx.processor().unmarshal(ctx, valBytes, ldr); + Object val = ctx.unmarshal(valBytes, ldr); return new CacheObjectImpl(val, valBytes); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9020b0c8/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java index 07fd9e3..0214bac 100644 --- a/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java +++ b/modules/core/src/test/java/org/apache/ignite/marshaller/optimized/OptimizedMarshallerNodeFailoverTest.java @@ -29,6 +29,7 @@ import org.apache.ignite.testframework.*; import org.apache.ignite.testframework.junits.common.*; import java.io.*; +import java.nio.*; import java.util.*; import java.util.concurrent.*; @@ -152,7 +153,7 @@ public class OptimizedMarshallerNodeFailoverTest extends GridCommonAbstractTest obj.val = 111; - byte[] bytes = marsh.marshal(obj); + ByteBuffer bytes = marsh.marshal(obj); stopAllGrids();
