You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2013/09/26 05:20:30 UTC
[1/3] git commit: don't let test pass by default
Updated Branches:
refs/heads/trunk e2a3456e2 -> 5832cc839
don't let test pass by default
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/00e871d0
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/00e871d0
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/00e871d0
Branch: refs/heads/trunk
Commit: 00e871d0fa4f34e0024d82934d7ec9649ab62680
Parents: ff76003
Author: Dave Brosius <db...@apache.org>
Authored: Wed Sep 25 23:15:52 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Sep 25 23:15:52 2013 -0400
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ReadMessageTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/00e871d0/test/unit/org/apache/cassandra/db/ReadMessageTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/ReadMessageTest.java b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
index 4b56b96..173f303 100644
--- a/test/unit/org/apache/cassandra/db/ReadMessageTest.java
+++ b/test/unit/org/apache/cassandra/db/ReadMessageTest.java
@@ -150,11 +150,12 @@ public class ReadMessageTest extends SchemaLoader
private boolean isEmptyCommitLog(BufferedInputStream is) throws IOException
{
+ DataInputStream dis = new DataInputStream(is);
byte[] lookahead = new byte[100];
- is.mark(100);
- is.read(lookahead);
- is.reset();
+ dis.mark(100);
+ dis.readFully(lookahead);
+ dis.reset();
for (int i = 0; i < 100; i++)
{
[3/3] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by db...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5832cc83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5832cc83
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5832cc83
Branch: refs/heads/trunk
Commit: 5832cc8398a0051da647d2331f90215f5023234d
Parents: e2a3456 b5c23cf
Author: Dave Brosius <db...@apache.org>
Authored: Wed Sep 25 23:20:09 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Sep 25 23:20:09 2013 -0400
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ReadMessageTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0
Posted by db...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b5c23cf7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b5c23cf7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b5c23cf7
Branch: refs/heads/trunk
Commit: b5c23cf740c2d04f873fe970c2bef15974518e0d
Parents: 83da4bd 00e871d
Author: Dave Brosius <db...@apache.org>
Authored: Wed Sep 25 23:19:33 2013 -0400
Committer: Dave Brosius <db...@apache.org>
Committed: Wed Sep 25 23:19:33 2013 -0400
----------------------------------------------------------------------
test/unit/org/apache/cassandra/db/ReadMessageTest.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b5c23cf7/test/unit/org/apache/cassandra/db/ReadMessageTest.java
----------------------------------------------------------------------