You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/03/05 09:55:28 UTC
[30/50] [abbrv] incubator-ignite git commit: Merge branch 'ignite-51'
of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-51
Merge branch 'ignite-51' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-51
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/88bc98dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/88bc98dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/88bc98dd
Branch: refs/heads/ignite-user-req
Commit: 88bc98dd2dfa1d56fed77933ac49c8a15549a172
Parents: 8157fed 4c7f456
Author: ivasilinets <iv...@gridgain.com>
Authored: Wed Mar 4 16:24:30 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Wed Mar 4 16:24:30 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheObjectAdapter.java | 1 +
.../processors/cache/CacheObjectImpl.java | 10 +--
.../processors/cache/GridCacheContext.java | 43 ++--------
.../processors/cache/GridCacheMapEntry.java | 83 ++++----------------
.../processors/cache/KeyCacheObjectImpl.java | 4 +-
.../processors/cache/UserCacheObjectImpl.java | 2 +-
.../cache/UserKeyCacheObjectImpl.java | 13 +--
.../local/atomic/GridLocalAtomicCache.java | 11 ---
.../cache/query/GridCacheQueryManager.java | 4 +-
.../transactions/IgniteTxLocalAdapter.java | 55 -------------
.../dataload/IgniteDataLoaderImpl.java | 4 +-
.../portable/GridPortableProcessor.java | 55 ++++++++-----
.../IgniteCacheObjectProcessorAdapter.java | 81 +++++++++++++++++++
.../portable/os/GridOsPortableProcessor.java | 44 -----------
14 files changed, 160 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/88bc98dd/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectImpl.java
index 5da0f79,51cb487..87ff779
--- 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
@@@ -94,10 -94,8 +94,10 @@@ public class CacheObjectImpl extends Ca
/** {@inheritDoc} */
@Override public void prepareMarshal(CacheObjectContext ctx) throws IgniteCheckedException {
+ assert val != null || valBytes != null;
+
if (valBytes == null && !byteArray())
- valBytes = CU.marshal(ctx.kernalContext().cache().context(), val);
+ valBytes = ctx.kernalContext().portable().marshal(ctx, val);
}
/** {@inheritDoc} */