ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From isap...@apache.org
Subject ignite git commit: IGNITE-4617: Fix for BinaryFieldMetadata
Date Wed, 29 Mar 2017 13:06:16 GMT
Repository: ignite
Updated Branches:
  refs/heads/master 348b9efdf -> caa16b33a


IGNITE-4617: Fix for BinaryFieldMetadata


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

Branch: refs/heads/master
Commit: caa16b33ae236efb8b4319ba104e73f87e32f895
Parents: 348b9ef
Author: Igor Sapego <isapego@gridgain.com>
Authored: Wed Mar 29 16:01:37 2017 +0300
Committer: Igor Sapego <isapego@gridgain.com>
Committed: Wed Mar 29 16:01:37 2017 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/internal/binary/BinaryMetadata.java   | 4 ++--
 modules/core/src/main/resources/META-INF/classnames.properties   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/caa16b33/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
index a2589bf..d1c79f3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/binary/BinaryMetadata.java
@@ -125,9 +125,9 @@ public class BinaryMetadata implements Externalizable {
      * @return Field type name.
      */
     @Nullable public String fieldTypeName(String fieldName) {
-        Integer typeId = fields != null ? fields.get(fieldName).typeId() : null;
+        BinaryFieldMetadata meta = fields != null ? fields.get(fieldName) : null;
 
-        return typeId != null ? BinaryUtils.fieldTypeName(typeId) : null;
+        return meta != null ? BinaryUtils.fieldTypeName(meta.typeId()) : null;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/ignite/blob/caa16b33/modules/core/src/main/resources/META-INF/classnames.properties
----------------------------------------------------------------------
diff --git a/modules/core/src/main/resources/META-INF/classnames.properties b/modules/core/src/main/resources/META-INF/classnames.properties
index 698d358..c5f4b92 100644
--- a/modules/core/src/main/resources/META-INF/classnames.properties
+++ b/modules/core/src/main/resources/META-INF/classnames.properties
@@ -235,6 +235,7 @@ org.apache.ignite.internal.IgniteServicesImpl
 org.apache.ignite.internal.IgnitionEx$IgniteNamedInstance$1
 org.apache.ignite.internal.NodeStoppingException
 org.apache.ignite.internal.binary.BinaryEnumObjectImpl
+org.apache.ignite.internal.binary.BinaryFieldMetadata
 org.apache.ignite.internal.binary.BinaryMetadata
 org.apache.ignite.internal.binary.BinaryObjectEx
 org.apache.ignite.internal.binary.BinaryObjectExImpl


Mime
View raw message