ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [17/51] [abbrv] incubator-ignite git commit: # ignite-684
Date Wed, 08 Apr 2015 10:11:08 GMT
# ignite-684


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

Branch: refs/heads/ignite-683-1
Commit: 6be884eec804c5ef1f060a7b0364f5ab52caf23a
Parents: 72c6dd1
Author: sboikov <sboikov@gridgain.com>
Authored: Tue Apr 7 12:17:31 2015 +0300
Committer: sboikov <sboikov@gridgain.com>
Committed: Tue Apr 7 12:17:31 2015 +0300

----------------------------------------------------------------------
 .../processors/cacheobject/IgniteCacheObjectProcessorImpl.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6be884ee/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 7815e91..95fb9f7 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
@@ -337,7 +337,8 @@ public class IgniteCacheObjectProcessorImpl extends GridProcessorAdapter
impleme
                     ClassLoader ldr = ctx.p2pEnabled() ?
                         IgniteUtils.detectClass(this.val).getClassLoader() : val.getClass().getClassLoader();
 
-                    Object val = ctx.processor().unmarshal(ctx, valBytes, ldr);
+                    Object val = this.val != null && ctx.processor().immutable(this.val)
? this.val :
+                        ctx.processor().unmarshal(ctx, valBytes, ldr);
 
                     return new CacheObjectImpl(val, valBytes);
                 }


Mime
View raw message