ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From voze...@apache.org
Subject ignite git commit: IGNITE-2100: Reverting flag backwards.
Date Mon, 14 Dec 2015 13:45:45 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-2100 ae21fa502 -> 060e09498


IGNITE-2100: Reverting flag backwards.


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

Branch: refs/heads/ignite-2100
Commit: 060e09498b19b95996e0878d186a7cf9c46f96cc
Parents: ae21fa5
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Mon Dec 14 16:46:42 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Mon Dec 14 16:46:42 2015 +0300

----------------------------------------------------------------------
 .../apache/ignite/binary/BinaryTypeConfiguration.java   |  2 +-
 .../apache/ignite/internal/binary/BinaryContext.java    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/060e0949/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
index fac16a6..9d00eee 100644
--- a/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/binary/BinaryTypeConfiguration.java
@@ -34,7 +34,7 @@ import java.io.Externalizable;
  */
 public class BinaryTypeConfiguration {
     /** Default value of "use default serialization" flag. */
-    public static final boolean DFLT_USE_DFLT_SER = false;
+    public static final boolean DFLT_USE_DFLT_SER = true;
 
     /** Class name. */
     private String typeName;

http://git-wip-us.apache.org/repos/asf/ignite/blob/060e0949/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 7617162..9cd8a94 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
@@ -113,8 +113,8 @@ public class BinaryContext implements Externalizable {
     /** */
     private final Map<String, BinaryIdMapper> typeMappers = new ConcurrentHashMap8<>(0);
 
-    /** Default serialization flags. */
-    private final Set<Integer> dfltSerializationFlags =
+    /** Non-default serialization flags. */
+    private final Set<Integer> nonDfltSerializationFlags =
         Collections.newSetFromMap(new ConcurrentHashMap<Integer, Boolean>());
 
     /** */
@@ -574,7 +574,7 @@ public class BinaryContext implements Externalizable {
             true,
             registered,
             false /* predefined */,
-            dfltSerializationFlags.contains(typeId)
+            !nonDfltSerializationFlags.contains(typeId)
         );
 
         if (!deserialize) {
@@ -733,7 +733,7 @@ public class BinaryContext implements Externalizable {
             false,
             true, /* registered */
             true, /* predefined */
-            false /* default serialization */
+            true /* default serialization */
         );
 
         predefinedTypeNames.put(typeName, id);
@@ -790,8 +790,8 @@ public class BinaryContext implements Externalizable {
 
         typeMappers.put(typeName, idMapper);
 
-        if (useDfltSerialization)
-            dfltSerializationFlags.add(id);
+        if (!useDfltSerialization)
+            nonDfltSerializationFlags.add(id);
 
         Map<String, Integer> fieldsMeta = null;
         Collection<BinarySchema> schemas = null;


Mime
View raw message