ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [01/10] ignite git commit: IGNITE-4673: Fixed type ID used for "java.lang.Object[]" in BinaryMarshaller. This closes #1512.
Date Fri, 17 Feb 2017 14:15:30 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-4705 eef1d3108 -> 2029d5a1e


IGNITE-4673: Fixed type ID used for "java.lang.Object[]" in BinaryMarshaller. This closes
#1512.


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

Branch: refs/heads/ignite-4705
Commit: 80825f7862065ba67d2f75fe0b9192562cc73c25
Parents: 85b08c5
Author: tledkov-gridgain <tledkov@gridgain.com>
Authored: Wed Feb 15 14:55:57 2017 +0300
Committer: devozerov <vozerov@gridgain.com>
Committed: Wed Feb 15 14:55:57 2017 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/binary/BinaryContext.java  | 1 +
 .../java/org/apache/ignite/internal/binary/BinaryUtils.java    | 6 ------
 .../apache/ignite/internal/binary/GridBinaryMarshaller.java    | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/80825f78/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 6d4cedd..ec2fc7b 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
@@ -278,6 +278,7 @@ public class BinaryContext {
 
         // IDs range from [0..200] is used by Java SDK API and GridGain legacy API
 
+        registerPredefinedType(Object.class, GridBinaryMarshaller.OBJECT);
         registerPredefinedType(Byte.class, GridBinaryMarshaller.BYTE);
         registerPredefinedType(Boolean.class, GridBinaryMarshaller.BOOLEAN);
         registerPredefinedType(Short.class, GridBinaryMarshaller.SHORT);

http://git-wip-us.apache.org/repos/asf/ignite/blob/80825f78/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 78bc31a..24c2f72 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
@@ -1567,9 +1567,6 @@ public class BinaryUtils {
         throws BinaryObjectException {
         Class cls;
 
-        if (typeId == GridBinaryMarshaller.OBJECT_TYPE_ID)
-            return Object.class;
-
         if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
             cls = ctx.descriptorForTypeId(true, typeId, ldr, false).describedClass();
         else {
@@ -1602,9 +1599,6 @@ public class BinaryUtils {
         @Nullable ClassLoader ldr, boolean deserialize) {
         Class cls;
 
-        if (typeId == GridBinaryMarshaller.OBJECT_TYPE_ID)
-            return Object.class;
-
         if (typeId != GridBinaryMarshaller.UNREGISTERED_TYPE_ID)
             cls = ctx.descriptorForTypeId(true, typeId, ldr, deserialize).describedClass();
         else {

http://git-wip-us.apache.org/repos/asf/ignite/blob/80825f78/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
index 8616155..d4b0ff4 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/GridBinaryMarshaller.java
@@ -190,7 +190,7 @@ public class GridBinaryMarshaller {
     public static final byte PLATFORM_JAVA_OBJECT_FACTORY_PROXY = 99;
 
     /** */
-    public static final int OBJECT_TYPE_ID = -1;
+    public static final int OBJECT = -1;
 
     /** */
     public static final int UNREGISTERED_TYPE_ID = 0;


Mime
View raw message