Repository: ignite Updated Branches: refs/heads/ignite-2100 47ede6494 -> 2ffeae1a5
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/06064764 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/06064764 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/06064764 Branch: refs/heads/ignite-2100 Commit: 060647641b6b6a6f4c79225c73ecff6d8024f280 Parents: 47ede64 Author: vozerov-gridgain <voze...@gridgain.com> Authored: Wed Dec 16 16:12:40 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Wed Dec 16 16:12:40 2015 +0300 ---------------------------------------------------------------------- .../internal/binary/BinaryClassDescriptor.java | 6 ++--- .../ignite/internal/binary/BinaryContext.java | 26 +++++--------------- 2 files changed, 8 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/06064764/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 5d443fd..eac1874 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 @@ -124,7 +124,6 @@ public class BinaryClassDescriptor { * @param serializer Serializer. * @param metaDataEnabled Metadata enabled flag. * @param registered Whether typeId has been successfully registered by MarshallerContext or not. - * @param predefined Whether the class is predefined or not. * @throws BinaryObjectException In case of error. */ BinaryClassDescriptor( @@ -137,15 +136,14 @@ public class BinaryClassDescriptor { @Nullable BinaryIdMapper idMapper, @Nullable BinarySerializer serializer, boolean metaDataEnabled, - boolean registered, - boolean predefined + boolean registered ) throws BinaryObjectException { assert ctx != null; assert cls != null; assert idMapper != null; // If serializer is not defined at this point, then we have to user OptimizedMarshaller. - useOptMarshaller = !predefined && serializer == null; + useOptMarshaller = serializer == null; // 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/06064764/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 4ddaaf4..30ad6bc 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 @@ -212,7 +212,7 @@ public class BinaryContext implements Externalizable { registerPredefinedType(LinkedHashMap.class, 0); // Classes with overriden default serialization flag. - registerPredefinedType(AffinityKey.class, 0, false); + registerPredefinedType(AffinityKey.class, 0); registerPredefinedType(GridMapEntry.class, 60); registerPredefinedType(IgniteBiTuple.class, 61); @@ -540,8 +540,7 @@ public class BinaryContext implements Externalizable { BinaryInternalIdMapper.defaultInstance(), null, false, - true, /* registered */ - false /* predefined */ + true /* registered */ ); BinaryClassDescriptor old = descByCls.putIfAbsent(cls, desc); @@ -591,8 +590,7 @@ public class BinaryContext implements Externalizable { idMapper, serializer, true, - registered, - false /* predefined */ + registered ); if (!deserialize) { @@ -746,16 +744,6 @@ public class BinaryContext implements Externalizable { * @return GridBinaryClassDescriptor. */ public BinaryClassDescriptor registerPredefinedType(Class<?> cls, int id) { - return registerPredefinedType(cls, id, true); - } - - /** - * @param cls Class. - * @param id Type ID. - * @param javaSerialization Use default serialization flag. - * @return GridBinaryClassDescriptor. - */ - public BinaryClassDescriptor registerPredefinedType(Class<?> cls, int id, boolean javaSerialization) { String typeName = typeName(cls.getName()); if (id == 0) @@ -769,10 +757,9 @@ public class BinaryContext implements Externalizable { typeName, null, BinaryInternalIdMapper.defaultInstance(), - javaSerialization ? null : new BinaryReflectiveSerializer(), + new BinaryReflectiveSerializer(), false, - true, /* registered */ - true /* predefined */ + true /* registered */ ); predefinedTypeNames.put(typeName, id); @@ -849,8 +836,7 @@ public class BinaryContext implements Externalizable { idMapper, serializer, true, - true, /* registered */ - false /* predefined */ + true /* registered */ ); fieldsMeta = desc.fieldsMeta();
