Merge remote-tracking branch 'origin/master'

This commit is contained in:
Rob Austin
2014-11-13 10:42:40 +00:00
2 changed files with 1 additions and 5 deletions
@@ -136,7 +136,7 @@ public abstract class AbstractChronicleMapBuilder<K, V,
private MapEventListener<K, V, ChronicleMap<K, V>> eventListener =
MapEventListeners.nop();
private V defaultValue = null;
private DefaultValueProvider<K, V> defaultValueProvider = NullValueProvider.INSTANCE;
private DefaultValueProvider<K, V> defaultValueProvider = null;
private PrepareValueBytes<K, V> prepareValueBytes = null;
private SingleChronicleHashReplication singleHashReplication = null;
@@ -17,7 +17,6 @@ public class DemoChronicleMapTest {
File file = File.createTempFile("DummyOrders", ".test");
file.deleteOnExit();
int maxEntries = 1000;
// ChronicleMap<IntValue, DemoOrderVOInterface> map = ChronicleMapBuilder
ChronicleMap<IntValue, DemoOrderVOInterface> map = OffHeapUpdatableChronicleMapBuilder
.of(IntValue.class, DemoOrderVOInterface.class)
.putReturnsNull(true)
@@ -37,7 +36,6 @@ public class DemoChronicleMapTest {
map.acquireUsing(key, value);
// TODO Shouldn't throw an NPE, because acquire should set the value.
value.setSymbol("IBM-" + i);
value.addAtomicOrderQty(1000);
@@ -61,7 +59,6 @@ public class DemoChronicleMapTest {
File file = File.createTempFile("DummyOrders", ".test");
file.deleteOnExit();
int maxEntries = 1000;
// ChronicleMap<IntValue, DemoOrderVOInterface> map = ChronicleMapBuilder
ChronicleMap<IntValue, DemoOrderVOInterface> map = OffHeapUpdatableChronicleMapBuilder
.of(IntValue.class, DemoOrderVOInterface.class)
.putReturnsNull(true)
@@ -80,7 +77,6 @@ public class DemoChronicleMapTest {
key.setValue(i);
try (WriteContext wc = map.acquireUsingLocked(key, value)) {
// TODO Shouldn't throw an NPE, because acquire should set the value.
value.setSymbol("IBM-" + i);
value.addAtomicOrderQty(1000);
}