You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by av...@apache.org on 2016/02/02 08:55:56 UTC
[05/16] ignite git commit: IGNITE-2498: Finalization (2).
IGNITE-2498: Finalization (2).
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0dfb7a54
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0dfb7a54
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0dfb7a54
Branch: refs/heads/ignite-2224
Commit: 0dfb7a546db98a7111c87affe3b960ea846fd750
Parents: 9103b20
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Jan 29 13:43:44 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Jan 29 13:43:44 2016 +0300
----------------------------------------------------------------------
.../internal/processors/cache/GridCacheMapEntry.java | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/0dfb7a54/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 b258c73..2d25d16 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 (isPeerClassLoadingEnabled()) {
+ if (cctx.deploymentEnabled()) {
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 (isPeerClassLoadingEnabled()) {
+ if (cctx.deploymentEnabled()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));
@@ -598,13 +598,6 @@ 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() {
@@ -4052,7 +4045,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme
IgniteUuid valClsLdrId = null;
IgniteUuid keyClsLdrId = null;
- if (isPeerClassLoadingEnabled()) {
+ if (cctx.deploymentEnabled()) {
if (val != null) {
valClsLdrId = cctx.deploy().getClassLoaderId(
U.detectObjectClassLoader(val.value(cctx.cacheObjectContext(), false)));