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/10/26 13:58:03 UTC
[20/22] ignite git commit: IGNITE-1770: Reader refactoring: removing
unused raw flags.
IGNITE-1770: Reader refactoring: removing unused raw flags.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f287cb68
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f287cb68
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f287cb68
Branch: refs/heads/ignite-1770
Commit: f287cb68e4c758aed8b291b95f206e5fcc0e6695
Parents: 7dc7f6a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Oct 26 13:59:32 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Oct 26 13:59:32 2015 +0300
----------------------------------------------------------------------
.../internal/portable/PortableReaderExImpl.java | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f287cb68/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
index 4ba6d52..7495246 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableReaderExImpl.java
@@ -132,9 +132,6 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
private final ClassLoader ldr;
/** */
- private int len;
-
- /** */
private PortableClassDescriptor desc;
/** Flag indicating that object header was parsed. */
@@ -1702,7 +1699,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
desc = ctx.descriptorForTypeId(userType, typeId, ldr);
- len = in.readInt();
+ int len = in.readInt();
in.position(start + hdrLen);
@@ -1891,9 +1888,9 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
break;
case OPTM_MARSH:
- int len = in.readInt();
+ int dataLen = in.readInt();
- ByteArrayInputStream input = new ByteArrayInputStream(in.array(), in.position(), len);
+ ByteArrayInputStream input = new ByteArrayInputStream(in.array(), in.position(), dataLen);
try {
obj = ctx.optimizedMarsh().unmarshal(input, null);
@@ -1902,7 +1899,7 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
throw new PortableException("Failed to unmarshal object with optimized marshaller", e);
}
- in.position(in.position() + len);
+ in.position(in.position() + dataLen);
break;
@@ -1910,9 +1907,6 @@ public class PortableReaderExImpl implements PortableReader, PortableRawReaderEx
throw new PortableException("Invalid flag value: " + flag);
}
- if (len == 0)
- len = in.position() - start;
-
return obj;
}