You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dm...@apache.org on 2016/03/24 12:41:27 UTC

[25/25] ignite git commit: IGNITE-2849: BINARY_OBJ time must be of Object type name

IGNITE-2849: BINARY_OBJ time must be of Object type name


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

Branch: refs/heads/ignite-2849
Commit: 8fa8769930866b94dc12f677d4e68b91dea24c9d
Parents: ab9387c
Author: Denis Magda <dm...@gridgain.com>
Authored: Thu Mar 24 14:40:55 2016 +0300
Committer: Denis Magda <dm...@gridgain.com>
Committed: Thu Mar 24 14:40:55 2016 +0300

----------------------------------------------------------------------
 .../ignite/internal/binary/BinaryUtils.java       | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/8fa87699/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 a293611..37f1d6a 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
@@ -218,7 +218,7 @@ public class BinaryUtils {
         FIELD_TYPE_NAMES[GridBinaryMarshaller.TIMESTAMP] = "Timestamp";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.ENUM] = "Enum";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.OBJ] = "Object";
-        FIELD_TYPE_NAMES[GridBinaryMarshaller.BINARY_OBJ] = "BinaryObject";
+        FIELD_TYPE_NAMES[GridBinaryMarshaller.BINARY_OBJ] = "Object";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.COL] = "Collection";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.MAP] = "Map";
         FIELD_TYPE_NAMES[GridBinaryMarshaller.CLASS] = "Class";
@@ -320,22 +320,6 @@ public class BinaryUtils {
     }
 
     /**
-     * @param typeName Field type name.
-     * @return Field type ID;
-     */
-    @SuppressWarnings("StringEquality")
-    public static int fieldTypeId(String typeName) {
-        for (int i = 0; i < FIELD_TYPE_NAMES.length; i++) {
-            String typeName0 = FIELD_TYPE_NAMES[i];
-
-            if (typeName.equals(typeName0))
-                return i;
-        }
-
-        throw new IllegalArgumentException("Invalid metadata type name: " + typeName);
-    }
-
-    /**
      * @param typeId Field type ID.
      * @return Field type name.
      */