Merge commit '0733366' into 2.1

Conflicts:
	src/test/java/net/openhft/chronicle/map/MarkTest.java
This commit is contained in:
leventov
2015-01-31 23:25:01 +07:00
9 changed files with 44 additions and 36 deletions
@@ -43,10 +43,12 @@ public class MarkTest {
});
}
@Test(timeout = 50000)
@Test(timeout = 25000)
public void persistedTest() {
final File db = Paths.get(System.getProperty("java.io.tmpdir"), "mark").toFile();
int rnd = new Random().nextInt();
final File db = Paths.get(System.getProperty("java.io.tmpdir"), "mark" + rnd).toFile();
if (db.exists())
db.delete();
try {
test(new Function<ChronicleMapBuilder<Integer, Integer>,
ChronicleMap<Integer, Integer>>() {