ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yzhda...@apache.org
Subject [1/4] incubator-ignite git commit: ignite-96 minor
Date Sat, 07 Feb 2015 23:17:17 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-96 24c2a4d24 -> 8ca85f012


ignite-96 minor


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ce7cea01
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ce7cea01
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ce7cea01

Branch: refs/heads/ignite-96
Commit: ce7cea01033b34cef69a472f943eb49d8e6acd1d
Parents: df3a3b3
Author: Yakov Zhdanov <yzhdanov@gridgain.com>
Authored: Sun Feb 8 01:36:43 2015 +0300
Committer: Yakov Zhdanov <yzhdanov@gridgain.com>
Committed: Sun Feb 8 01:36:43 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheMapEntry.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/ce7cea01/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 ca894ea..88cd3f1 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
@@ -510,7 +510,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K,
V>
                     e = detached() ? cctx.swap().read(this, true, true, true) : cctx.swap().readAndRemove(this);
 
                 if (log.isDebugEnabled())
-                    log.debug("Read swap entry [swapEntry=" + e + ", Entry=" + this + ']');
+                    log.debug("Read swap entry [swapEntry=" + e + ", cacheEntry=" + this
+ ']');
 
                 flags |= IS_UNSWAPPED_MASK;
 
@@ -3695,7 +3695,7 @@ public abstract class GridCacheMapEntry<K, V> implements GridCacheEntryEx<K,
V>
     /** {@inheritDoc} */
     @Override public Cache.Entry<K, V> wrap() {
         try {
-            CacheEntryImpl<K, V> entry = new CacheEntryImpl<>(key, rawGetOrUnmarshal(true));
+            CacheEntryImpl<K, V> entry = new CacheEntryImpl<>(key, rawGetOrUnmarshal(false));
 
             entry.version(ver);
 


Mime
View raw message