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 2015/12/16 13:50:16 UTC
[3/3] ignite git commit: IGNITE-2100: Finalization.
IGNITE-2100: Finalization.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/47ede649
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/47ede649
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/47ede649
Branch: refs/heads/ignite-2100
Commit: 47ede649415134ebbc6eac68dd4fb92819374c88
Parents: 9ea845f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Dec 16 15:51:12 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Dec 16 15:51:12 2015 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/binary/BinaryContext.java | 11 ++++++++++-
.../org/apache/ignite/internal/binary/BinaryUtils.java | 2 --
.../internal/processors/query/GridQueryProcessor.java | 1 -
3 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/47ede649/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
index 67d8e21..4ddaaf4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryContext.java
@@ -578,7 +578,7 @@ public class BinaryContext implements Externalizable {
}
BinarySerializer serializer = BinaryUtils.isBinarylizable(cls) || !BinaryUtils.isCustomJavaSerialization(cls) ?
- new BinaryReflectiveSerializer() : null;
+ new BinaryReflectiveSerializer() : defaultSerializer();
String affFieldName = affinityFieldName(cls);
@@ -615,6 +615,15 @@ public class BinaryContext implements Externalizable {
}
/**
+ * @return Default serializer.
+ */
+ private BinarySerializer defaultSerializer() {
+ BinaryConfiguration binCfg = igniteCfg.getBinaryConfiguration();
+
+ return binCfg != null ? binCfg.getSerializer() : null;
+ }
+
+ /**
* @param cls Collection class.
* @return Collection type ID.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/47ede649/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
index 52a14f0..8cb4b38 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryUtils.java
@@ -59,8 +59,6 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListSet;
-import org.apache.ignite.marshaller.optimized.OptimizedMarshaller;
-
import static java.nio.charset.StandardCharsets.UTF_8;
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/47ede649/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
index 0eb49eb..b2a51c4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java
@@ -36,7 +36,6 @@ import org.apache.ignite.events.CacheQueryExecutedEvent;
import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.binary.BinaryMarshaller;
-import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.processors.GridProcessorAdapter;
import org.apache.ignite.internal.processors.cache.CacheEntryImpl;
import org.apache.ignite.internal.processors.cache.CacheObject;