You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ty...@apache.org on 2014/05/28 23:44:20 UTC
git commit: Fix DataOutputTest on Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 929eaa75e -> 5767757ab
Fix DataOutputTest on Windows
Patch by Ala' Alkhaldi; review by Joshua McKenzie for CASSANDRA-7265
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5767757a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5767757a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5767757a
Branch: refs/heads/cassandra-2.1
Commit: 5767757abc98759c7c3cf955b03e972d29fda633
Parents: 929eaa7
Author: Tyler Hobbs <ty...@datastax.com>
Authored: Wed May 28 16:43:26 2014 -0500
Committer: Tyler Hobbs <ty...@datastax.com>
Committed: Wed May 28 16:43:26 2014 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
test/unit/org/apache/cassandra/io/util/DataOutputTest.java | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5767757a/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index b837194..f62d5b0 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -27,6 +27,7 @@
* Allow nulls/non-existant fields in UDT (CASSANDRA-7206)
* Backport Thrift MultiSliceRequest (CASSANDRA-7027)
* Handle overlapping MultiSlices (CASSANDRA-7279)
+ * Fix DataOutputTest on Windows (CASSANDRA-7265)
Merged from 2.0:
* Copy compaction options to make sure they are reloaded (CASSANDRA-7290)
* Add option to do more aggressive tombstone compactions (CASSANDRA-6563)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5767757a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java b/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
index fb45dd3..76f3304 100644
--- a/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
+++ b/test/unit/org/apache/cassandra/io/util/DataOutputTest.java
@@ -100,8 +100,9 @@ public class DataOutputTest
DataOutputStreamAndChannel write = new DataOutputStreamAndChannel(new FileOutputStream(file));
DataInput canon = testWrite(write);
write.close();
- DataInput test = new DataInputStream(new FileInputStream(file));
+ DataInputStream test = new DataInputStream(new FileInputStream(file));
testRead(test, canon);
+ test.close();
}
finally
{
@@ -119,8 +120,9 @@ public class DataOutputTest
DataOutputStreamAndChannel write = new DataOutputStreamAndChannel(Channels.newOutputStream(raf.getChannel()), raf.getChannel());
DataInput canon = testWrite(write);
write.close();
- DataInput test = new DataInputStream(new FileInputStream(file));
+ DataInputStream test = new DataInputStream(new FileInputStream(file));
testRead(test, canon);
+ test.close();
}
finally
{
@@ -137,8 +139,9 @@ public class DataOutputTest
DataInput canon = testWrite(write);
write.flush();
write.close();
- DataInput test = new DataInputStream(new FileInputStream(file));
+ DataInputStream test = new DataInputStream(new FileInputStream(file));
testRead(test, canon);
+ test.close();
Assert.assertTrue(file.delete());
}