ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject [29/50] [abbrv] ignite git commit: IGNITE-1958: Removed unused method.
Date Sat, 21 Nov 2015 02:02:07 GMT
IGNITE-1958: Removed unused method.


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

Branch: refs/heads/ignite-1753-1282
Commit: b876f76bedceab4d8ffbfb9b3fc69700fd005af4
Parents: 6d83421
Author: vozerov-gridgain <vozerov@gridgain.com>
Authored: Fri Nov 20 11:32:30 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
Committed: Fri Nov 20 11:32:30 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/portable/BinaryObjectImpl.java      |  2 +-
 .../internal/portable/BinaryObjectOffheapImpl.java      |  4 +---
 .../ignite/internal/portable/BinaryReaderExImpl.java    | 12 ++----------
 3 files changed, 4 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/b876f76b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
index 7ab9497..37c88e2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectImpl.java
@@ -416,7 +416,7 @@ public final class BinaryObjectImpl extends BinaryObjectEx implements
Externaliz
 
     /** {@inheritDoc} */
     @Override public boolean hasField(String fieldName) {
-        return newReader().hasField(fieldName);
+        return newReader().findFieldByName(fieldName);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/b876f76b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
index 6f9190a..1db3470 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/BinaryObjectOffheapImpl.java
@@ -18,7 +18,6 @@
 package org.apache.ignite.internal.portable;
 
 import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.binary.BinaryField;
 import org.apache.ignite.binary.BinaryObject;
 import org.apache.ignite.binary.BinaryObjectException;
 import org.apache.ignite.binary.BinaryType;
@@ -26,7 +25,6 @@ import org.apache.ignite.internal.portable.streams.PortableOffheapInputStream;
 import org.apache.ignite.internal.processors.cache.CacheObject;
 import org.apache.ignite.internal.processors.cache.CacheObjectContext;
 import org.apache.ignite.internal.util.GridUnsafe;
-import org.apache.ignite.internal.util.typedef.internal.A;
 import org.apache.ignite.internal.util.typedef.internal.U;
 import org.apache.ignite.plugin.extensions.communication.MessageReader;
 import org.apache.ignite.plugin.extensions.communication.MessageWriter;
@@ -334,7 +332,7 @@ public class BinaryObjectOffheapImpl extends BinaryObjectEx implements
Externali
 
     /** {@inheritDoc} */
     @Override public boolean hasField(String fieldName) {
-        return newReader().hasField(fieldName);
+        return newReader().findFieldByName(fieldName);
     }
 
     /** {@inheritDoc} */

http://git-wip-us.apache.org/repos/asf/ignite/blob/b876f76b/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 5e31532..356aaae 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
@@ -300,7 +300,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @throws BinaryObjectException In case of error.
      */
     @Nullable Object unmarshalField(String fieldName) throws BinaryObjectException {
-        return hasField(fieldName) ? unmarshal() : null;
+        return findFieldByName(fieldName) ? unmarshal() : null;
     }
 
     /**
@@ -1374,14 +1374,6 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
             ", actual=" + flag + ']');
     }
 
-    /**
-     * @param fieldName Field name.
-     * @return {@code True} if field is set.
-     */
-    public boolean hasField(String fieldName) {
-        return findFieldById(fieldId(fieldName));
-    }
-
     /** {@inheritDoc} */
     @Override public BinaryRawReader rawReader() {
         in.position(rawOff);
@@ -2475,7 +2467,7 @@ public class BinaryReaderExImpl implements BinaryReader, BinaryRawReaderEx,
Obje
      * @param name Field name.
      * @return Offset.
      */
-    private boolean findFieldByName(String name) {
+    public boolean findFieldByName(String name) {
         assert hdrLen != 0;
 
         if (footerLen == 0)


Mime
View raw message