natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix DataOutputTest on Windows 

Patch by Ala' Alkhaldi; review by Joshua McKenzie for CASSANDRA-7265
This commit is contained in:
Tyler Hobbs 2014-05-28 16:43:26 -05:00
parent 929eaa75e8
commit 5767757abc
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -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)

9
test/unit/org/apache/cassandra/io/util/DataOutputTest.java
View File

@ -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());
}