ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dma...@apache.org
Subject [40/40] ignite git commit: IGNITE-2947: fixed issue
Date Thu, 05 May 2016 19:38:14 GMT
IGNITE-2947: fixed issue


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f0a595e7
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f0a595e7
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f0a595e7

Branch: refs/heads/ignite-2947
Commit: f0a595e77bf23f8338910508c10701a62f0283aa
Parents: e0fbc11
Author: Denis Magda <dmagda@gridgain.com>
Authored: Thu May 5 22:37:17 2016 +0300
Committer: Denis Magda <dmagda@gridgain.com>
Committed: Thu May 5 22:37:17 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/binary/BinaryClassDescriptor.java  | 13 +++++++++++++
 .../apache/ignite/internal/binary/BinaryContext.java   |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f0a595e7/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 a8280dd..d2d715b 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
@@ -62,6 +62,9 @@ public class BinaryClassDescriptor {
     /** Configured serializer. */
     private final BinarySerializer serializer;
 
+    /** Serializer that is passed during BinaryClassDescriptor construction. Can differ from
{@link #serializer}. */
+    private final BinarySerializer initialSerializer;
+
     /** ID mapper. */
     private final BinaryInternalMapper mapper;
 
@@ -142,6 +145,8 @@ public class BinaryClassDescriptor {
         assert cls != null;
         assert mapper != null;
 
+        initialSerializer = serializer;
+
         // If serializer is not defined at this point, then we have to user OptimizedMarshaller.
         useOptMarshaller = serializer == null;
 
@@ -404,6 +409,14 @@ public class BinaryClassDescriptor {
     }
 
     /**
+     * @return Initial serializer that is passed during BinaryClassDescriptor construction.
+     * Can differ from {@link #serializer}.
+     */
+    BinarySerializer initialSerializer() {
+        return initialSerializer;
+    }
+
+    /**
      * @return Affinity field key name.
      */
     String affFieldKeyName() {

http://git-wip-us.apache.org/repos/asf/ignite/blob/f0a595e7/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 652862f..1a77f9b 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
@@ -741,7 +741,7 @@ public class BinaryContext {
         }
 
         if (registered) {
-            BinarySerializer serializer = desc.serializer();
+            BinarySerializer serializer = desc.initialSerializer();
 
             if (serializer == null)
                 serializer = serializerForClass(desc.describedClass());


Mime
View raw message