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/23 16:28:23 UTC

[8/8] ignite git commit: IGNITE-1770: Better raw mode handling.

IGNITE-1770: Better raw mode handling.


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

Branch: refs/heads/ignite-1770
Commit: d5327836941fd4805ca441de51a81e427484bfb6
Parents: 7cf2136
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Oct 23 17:28:53 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Oct 23 17:28:53 2015 +0300

----------------------------------------------------------------------
 .../ignite/internal/portable/PortableWriterExImpl.java    | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d5327836/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
index fdff5ce..9fb5e56 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableWriterExImpl.java
@@ -328,11 +328,10 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
     }
 
     /**
-     *
+     * Write length and raw offset.
      */
     public void writeLengthAndRawOffset() {
-        if (rawOffPos == 0)
-            out.writeInt(start + RAW_DATA_OFF_POS, out.position() - start);
+        out.writeInt(start + RAW_DATA_OFF_POS, (rawOffPos == 0 ? out.position() : rawOffPos) - start);
 
         out.writeInt(start + TOTAL_LEN_POS, out.position() - start);
     }
@@ -1702,11 +1701,8 @@ public class PortableWriterExImpl implements PortableWriter, PortableRawWriterEx
 
     /** {@inheritDoc} */
     @Override public PortableRawWriter rawWriter() {
-        if (rawOffPos == 0) {
-            out.writeInt(start + RAW_DATA_OFF_POS, out.position() - start);
-
+        if (rawOffPos == 0)
             rawOffPos = out.position();
-        }
 
         return this;
     }