Merge branch 'cassandra-2.1' into trunk
Conflicts:
src/java/org/apache/cassandra/service/RowDataResolver.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/36edbda6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/36edbda6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/36edbda6
Branch: refs/heads/trunk
Commit: 36edbda64185fc7ecffc93e7de3a4a67e1cec064
Parents: 54e4247 ba50db4
Author: Aleksey Yeschenko <[email protected]>
Authored: Wed Oct 8 00:04:20 2014 +0300
Committer: Aleksey Yeschenko <[email protected]>
Committed: Wed Oct 8 00:04:20 2014 +0300
----------------------------------------------------------------------
src/java/org/apache/cassandra/service/RowDataResolver.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/36edbda6/src/java/org/apache/cassandra/service/RowDataResolver.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/service/RowDataResolver.java
index 6c222d5,e92dad7..44b341b
--- a/src/java/org/apache/cassandra/service/RowDataResolver.java
+++ b/src/java/org/apache/cassandra/service/RowDataResolver.java
@@@ -159,7 -159,8 +159,8 @@@ public class RowDataResolver extends Ab
public Row getData()
{
+ assert !replies.isEmpty();
- return replies.peek().payload.row();
+ return replies.get(0).payload.row();
}
public boolean isDataPresent()
