You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/11/18 15:35:32 UTC
ignite git commit: IGNITE-1917: Refactoring: objects.
Repository: ignite
Updated Branches:
refs/heads/ignite-1917 e137f8fb3 -> c02648300
IGNITE-1917: Refactoring: objects.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0264830
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0264830
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0264830
Branch: refs/heads/ignite-1917
Commit: c0264830057b5ac80db0dc6babceab1ebc5ada1f
Parents: e137f8f
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Nov 18 17:34:30 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Nov 18 17:34:30 2015 +0300
----------------------------------------------------------------------
.../internal/portable/BinaryReaderExImpl.java | 61 ++++++++++----------
1 file changed, 29 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c0264830/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
index 018ef74..0f31e9d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryReaderExImpl.java
@@ -305,33 +305,6 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Obje
/**
* @param fieldId Field ID.
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- @Nullable Object readObject(int fieldId) throws BinaryObjectException {
- return findFieldById(fieldId) ? doReadObject() : null;
- }
-
- /**
- * @param fieldId Field ID.
- * @return Value.
- * @throws BinaryObjectException In case of error.
- */
- @Nullable Object[] readObjectArray(int fieldId) throws BinaryObjectException {
- if (findFieldById(fieldId)) {
- Flag flag = checkFlag(OBJ_ARR);
-
- if (flag == Flag.NORMAL)
- return doReadObjectArray(true);
- else if (flag == Flag.HANDLE)
- return readHandleField();
- }
-
- return null;
- }
-
- /**
- * @param fieldId Field ID.
* @param cls Collection class.
* @return Value.
* @throws BinaryObjectException In case of error.
@@ -1190,7 +1163,16 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Obje
/** {@inheritDoc} */
@SuppressWarnings("unchecked")
@Nullable @Override public <T> T readObject(String fieldName) throws BinaryObjectException {
- return (T)readObject(fieldId(fieldName));
+ return findFieldByName(fieldName) ? (T)doReadObject() : null;
+ }
+
+ /**
+ * @param fieldId Field ID.
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable Object readObject(int fieldId) throws BinaryObjectException {
+ return findFieldById(fieldId) ? doReadObject() : null;
}
/** {@inheritDoc} */
@@ -1205,15 +1187,30 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx, Obje
/** {@inheritDoc} */
@Nullable @Override public Object[] readObjectArray(String fieldName) throws BinaryObjectException {
- return readObjectArray(fieldId(fieldName));
+ return findFieldByName(fieldName) ? this.readObjectArray() : null;
+ }
+
+ /**
+ * @param fieldId Field ID.
+ * @return Value.
+ * @throws BinaryObjectException In case of error.
+ */
+ @Nullable Object[] readObjectArray(int fieldId) throws BinaryObjectException {
+ return findFieldById(fieldId) ? this.readObjectArray() : null;
}
/** {@inheritDoc} */
@Nullable @Override public Object[] readObjectArray() throws BinaryObjectException {
- if (checkFlag(OBJ_ARR) == Flag.NULL)
- return null;
+ switch (checkFlag(OBJ_ARR)) {
+ case NORMAL:
+ return doReadObjectArray(true);
- return doReadObjectArray(true);
+ case HANDLE:
+ return readHandleField();
+
+ default:
+ return null;
+ }
}
/** {@inheritDoc} */