ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [8/9] incubator-ignite git commit: # ignite fixed portable deserialization on get
Date Tue, 30 Dec 2014 09:07:22 GMT
# ignite fixed portable deserialization on get


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

Branch: refs/heads/ignite-1
Commit: 6fd75f907c96a0b5eb31b0e118a4e88895a501fd
Parents: 8488174
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Dec 30 11:23:16 2014 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Dec 30 11:23:16 2014 +0300

----------------------------------------------------------------------
 .../gridgain/grid/kernal/processors/cache/GridCacheAdapter.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6fd75f90/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
index 82098bb..2022680 100644
--- a/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
+++ b/modules/core/src/main/java/org/gridgain/grid/kernal/processors/cache/GridCacheAdapter.java
@@ -1776,8 +1776,8 @@ public abstract class GridCacheAdapter<K, V> extends GridMetadataAwareAdapter
im
                             else {
                                 val = ctx.cloneOnFlag(val);
 
-                                if (ctx.portableEnabled() && deserializePortable
&& val instanceof PortableObject)
-                                    val = ((PortableObject)val).deserialize();
+                                if (ctx.portableEnabled() && deserializePortable)
+                                    val = (V)ctx.unwrapPortableIfNeeded(val, false);
 
                                 map.put(key, val);
 


Mime
View raw message