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/11/22 11:48:37 UTC
[2/4] ignite git commit: Fix.
Fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a171f976
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a171f976
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a171f976
Branch: refs/heads/ignite-4259-1
Commit: a171f9766336ba38853acd2be272d0b4b8e40305
Parents: c8c62d6
Author: devozerov <vo...@gridgain.com>
Authored: Tue Nov 22 14:13:17 2016 +0300
Committer: devozerov <vo...@gridgain.com>
Committed: Tue Nov 22 14:13:17 2016 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/binary/BinaryClassDescriptor.java | 3 ++-
.../java/org/apache/ignite/internal/binary/BinaryContext.java | 6 ++----
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a171f976/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
index d05ce71..813237a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryClassDescriptor.java
@@ -41,6 +41,7 @@ import org.apache.ignite.binary.BinaryReflectiveSerializer;
import org.apache.ignite.binary.BinarySerializer;
import org.apache.ignite.binary.Binarylizable;
import org.apache.ignite.internal.processors.cache.CacheObjectImpl;
+import org.apache.ignite.internal.processors.query.GridQueryProcessor;
import org.apache.ignite.internal.util.GridUnsafe;
import org.apache.ignite.internal.util.IgniteUtils;
import org.apache.ignite.internal.util.tostring.GridToStringExclude;
@@ -156,7 +157,7 @@ public class BinaryClassDescriptor {
initialSerializer = serializer;
// If serializer is not defined at this point, then we have to use OptimizedMarshaller.
- useOptMarshaller = serializer == null;
+ useOptMarshaller = serializer == null || GridQueryProcessor.isGeometryClass(cls);
// Reset reflective serializer so that we rely on existing reflection-based serialization.
if (serializer instanceof BinaryReflectiveSerializer)
http://git-wip-us.apache.org/repos/asf/ignite/blob/a171f976/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 7e7afa5..cc18318 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
@@ -352,16 +352,14 @@ public class BinaryContext {
*/
@SuppressWarnings("SimplifiableIfStatement")
public boolean mustDeserialize(Class cls) {
- if (GridQueryProcessor.isGeometryClass(cls))
- return true;
-
BinaryClassDescriptor desc = descByCls.get(cls);
if (desc == null) {
if (BinaryUtils.wrapTrees() && (cls == TreeMap.class || cls == TreeSet.class))
return false;
- return marshCtx.isSystemType(cls.getName()) || serializerForClass(cls) == null;
+ return marshCtx.isSystemType(cls.getName()) || serializerForClass(cls) == null ||
+ GridQueryProcessor.isGeometryClass(cls);
}
else
return desc.useOptimizedMarshaller();