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/03 05:56:05 UTC
incubator-ignite git commit: # ignite-51
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-51 05bb9d2e0 -> 0687b0382
# 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/0687b038
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0687b038
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0687b038
Branch: refs/heads/ignite-51
Commit: 0687b03822c2b2aac28bd9f1b718fcb46996127f
Parents: 05bb9d2
Author: sboikov <sb...@gridgain.com>
Authored: Tue Mar 3 07:55:55 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Mar 3 07:55:55 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/cache/GridCacheMapEntry.java | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0687b038/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 8b1ad5f..83742c4 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
@@ -3261,12 +3261,8 @@ public abstract class GridCacheMapEntry implements GridCacheEntryEx {
}
if (cctx.store().isLocalStore()) {
- if (val != null || valBytes != null) {
- if (val == null)
- val = cctx.marshaller().<V>unmarshal(valBytes, cctx.deploy().globalLoader());
-
+ if (val != null)
cctx.store().putToStore(null, key, val, ver);
- }
}
return true;