Merge remote-tracking branch 'origin/master'

This commit is contained in:
Peter Lawrey
2014-12-16 21:52:58 +00:00
2 changed files with 95 additions and 22 deletions
@@ -182,7 +182,6 @@ public class ChronicleMapImportExportTest {
}
@Ignore("HCOLL-242 - this type of off heap reference is not currently supported")
@Test
public void testWithLongValue() throws IOException, InterruptedException {
@@ -208,6 +207,7 @@ public class ChronicleMapImportExportTest {
try (ChronicleMap<CharSequence, LongValue> actual = ChronicleMapBuilder.of(CharSequence.class, LongValue
.class)
.create()) {
actual.putAll(file);
Assert.assertEquals(expected, actual);