You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/01 13:09:47 UTC
[2/6] ignite git commit: IGNITE-2498: Full fix for (p2p + offheap)
deserialization issue.
IGNITE-2498: Full fix for (p2p + offheap) deserialization issue.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5c76f80b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5c76f80b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5c76f80b
Branch: refs/heads/master
Commit: 5c76f80bf872989d0376d8f03e1adac6dc509222
Parents: 1614c75
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 12:44:49 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 12:44:49 2016 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheMapEntry.java | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5c76f80b/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 775ba87..19c1312 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
@@ -220,7 +220,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
else {
try {
- if (cctx.kernalContext().config().isPeerClassLoadingEnabled()) {
+ if (isPeerClassLoadingEnabled()) {
Object val0 = null;
if (val != null && val.cacheObjectType() != CacheObject.TYPE_BYTE_ARR) {
@@ -571,7 +571,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (cctx.kernalContext().config().isPeerClassLoadingEnabled() && !cctx.binaryMarshaller()) {
+ if (isPeerClassLoadingEnabled()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));
@@ -598,6 +598,13 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
}
/**
+ * @return {@code True} if peer class loading is enabled.
+ */
+ private boolean isPeerClassLoadingEnabled() {
+ return !cctx.binaryMarshaller() && cctx.kernalContext().config().isPeerClassLoadingEnabled();
+ }
+
+ /**
* @return Value bytes and flag indicating whether value is byte array.
*/
protected IgniteBiTuple<byte[], Byte> valueBytes0() {
@@ -3157,7 +3164,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
if (hasOffHeapPointer()) {
CacheObject val0 = cctx.fromOffheap(offHeapPointer(), tmp);
- if (!tmp && cctx.kernalContext().config().isPeerClassLoadingEnabled())
+ if (!tmp && isPeerClassLoadingEnabled())
val0.finishUnmarshal(cctx.cacheObjectContext(), cctx.deploy().globalLoader());
return val0;
@@ -4045,7 +4052,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (cctx.kernalContext().config().isPeerClassLoadingEnabled()) {
+ if (isPeerClassLoadingEnabled()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));