You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by nt...@apache.org on 2016/02/01 15:21:33 UTC
[25/49] ignite git commit: IGNITE-2498: Fix.
IGNITE-2498: Fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1614c750
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1614c750
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1614c750
Branch: refs/heads/ignite-2435
Commit: 1614c75076bce5a67e95efa7fae2d2a1ea015729
Parents: 79db260
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 12:20:12 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 12:20:12 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/processors/cache/GridCacheMapEntry.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1614c750/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 c896a82..775ba87 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
@@ -571,7 +571,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (cctx.kernalContext().config().isPeerClassLoadingEnabled()) {
+ if (cctx.kernalContext().config().isPeerClassLoadingEnabled() && !cctx.binaryMarshaller()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));