Author: jbellis
Date: Mon Aug 15 04:03:21 2011
New Revision: 1157707
URL: http://svn.apache.org/viewvc?rev=1157707&view=rev
Log:
accomodate "short" skip results
patch by Dave Brosius; reviewed by jbellis for CASSANDRA-3034
Modified:
cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
Modified:
cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
URL:
http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java?rev=1157707&r1=1157706&r2=1157707&view=diff
==============================================================================
---
cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
(original)
+++
cassandra/trunk/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
Mon Aug 15 04:03:21 2011
@@ -139,9 +139,9 @@ public class IncomingTcpConnection exten
input.readFully(body, offset, CHUNK_SIZE);
input.readFully(body, bodySize - remainder, remainder);
// earlier versions would send unnecessary bytes left over at the end
of a buffer, too
- int remaining = totalSize -
OutboundTcpConnection.messageLength(header, id, body);
- if (remaining > 0)
- input.skip(remaining);
+ long remaining = totalSize -
OutboundTcpConnection.messageLength(header, id, body);
+ while (remaining > 0)
+ remaining -= input.skip(remaining);
// for non-streaming connections, continue to read the messages (and
ignore them) until sender
// starts sending correct-version messages (which it can do without
reconnecting -- version is per-Message)
