Repository: incubator-apex-core Updated Branches: refs/heads/release-3.3 27dd12ca3 -> d5315edec
APEXCORE-365 - Adjust size for the VarInt length Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/commit/d5315ede Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/d5315ede Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/d5315ede Branch: refs/heads/release-3.3 Commit: d5315edecf44e46955b4e47549215a858ac88bc1 Parents: 27dd12c Author: Vlad Rozov <[email protected]> Authored: Wed Mar 2 08:56:13 2016 -0800 Committer: Thomas Weise <[email protected]> Committed: Wed Mar 2 10:21:18 2016 -0800 ---------------------------------------------------------------------- .../main/java/com/datatorrent/bufferserver/server/Server.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-core/blob/d5315ede/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java ---------------------------------------------------------------------- diff --git a/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java b/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java index c2da111..76a0140 100644 --- a/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java +++ b/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java @@ -665,7 +665,7 @@ public class Server implements ServerListener * so we allocate a new byteBuffer and copy over the partially written data to the * new byteBuffer and start as if we always had full room but not enough data. */ - if (!switchToNewBufferOrSuspendRead(buffer, readOffset, size)) { + if (!switchToNewBufferOrSuspendRead(buffer, readOffset, size + VarInt.getSize(size))) { return false; } } @@ -694,7 +694,7 @@ public class Server implements ServerListener /* * hit wall while writing serialized data, so have to allocate a new byteBuffer. */ - if (!switchToNewBufferOrSuspendRead(buffer, readOffset - VarInt.getSize(size), size)) { + if (!switchToNewBufferOrSuspendRead(buffer, readOffset - VarInt.getSize(size), size + VarInt.getSize(size))) { readOffset -= VarInt.getSize(size); size = 0; return false;
