[FLINK-4894] [network] Fix hasData() and correctly clear buffer state

StephanEwen · Oct 28, 2016 · 4b86701 · 4b86701
1 parent cc6655b
commit 4b86701
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/.../java/org/apache/flink/runtime/io/network/api/serialization/SpanningRecordSerializer.java b/.../java/org/apache/flink/runtime/io/network/api/serialization/SpanningRecordSerializer.java
@@ -172,6 +172,8 @@ public Buffer getCurrentBuffer() {
 	@Override
 	public void clearCurrentBuffer() {
 		targetBuffer = null;
+		position = 0;
+		limit = 0;
 	}
 
 	@Override
@@ -188,7 +190,7 @@ public void clear() {
 	@Override
 	public boolean hasData() {
 		// either data in current target buffer or intermediate buffers
-		return (this.position > 0 && this.position < this.limit) || (this.lengthBuffer.hasRemaining() || this.dataBuffer.hasRemaining());
+		return this.position > 0 || (this.lengthBuffer.hasRemaining() || this.dataBuffer.hasRemaining());
 	}
 
 	@Override