You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apex.apache.org by th...@apache.org on 2016/03/02 19:19:12 UTC
incubator-apex-core git commit: APEXCORE-365 - Adjust size for the
VarInt length
Repository: incubator-apex-core
Updated Branches:
refs/heads/release-3.2 7ae902eb3 -> 72277ae7d
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/72277ae7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/tree/72277ae7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-core/diff/72277ae7
Branch: refs/heads/release-3.2
Commit: 72277ae7d09ae0d348c810ce615aae22d6cd0046
Parents: 7ae902e
Author: Vlad Rozov <v....@datatorrent.com>
Authored: Wed Mar 2 08:56:13 2016 -0800
Committer: Vlad Rozov <v....@datatorrent.com>
Committed: Wed Mar 2 08:56:13 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/72277ae7/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 3df17c9..a78b136 100644
--- a/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
+++ b/bufferserver/src/main/java/com/datatorrent/bufferserver/server/Server.java
@@ -652,7 +652,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;
}
}
@@ -681,7 +681,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;