From a20ccd97c0c3c4d1bd618acbb9e20e20ba8b1d34 Mon Sep 17 00:00:00 2001 From: leventov Date: Mon, 27 Oct 2014 20:35:09 +0300 Subject: [PATCH] HCOLL-160 fixes after the prev commit --- .../java/net/openhft/chronicle/map/VanillaChronicleMap.java | 3 ++- .../java/net/openhft/chronicle/map/DefaultValueTest.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java index 8eed059e9..705fa0ebc 100644 --- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java +++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java @@ -779,7 +779,8 @@ class VanillaChronicleMap, V onKeyAbsentOnAcquire(ThreadLocalCopies copies, K key, long keySize, V usingValue, long offset) { - NativeBytes entry = entry(offset); + incrementSize(); + MultiStoreBytes entry = entry(offset); entry.skip(keySizeMarshaller.sizeEncodingSize(keySize) + keySize); skipReplicationBytes(entry); V v = readValue(copies, entry, usingValue); diff --git a/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java b/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java index ddcbcb58a..249b017ad 100644 --- a/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java +++ b/src/test/java/net/openhft/chronicle/map/DefaultValueTest.java @@ -41,17 +41,17 @@ public class DefaultValueTest { .of(String.class, (Class>) ((Class) List.class)) .defaultValue(defaultValue).file(file).create()) { - assertEquals(defaultValue, map.get("a")); + assertEquals(defaultValue, map.acquireUsing("a", null)); assertEquals(1, map.size()); map.put("b", Arrays.asList(1, 2)); - assertEquals(Arrays.asList(1, 2), map.get("b")); + assertEquals(Arrays.asList(1, 2), map.acquireUsing("b", null)); } try (ChronicleMap> map = ChronicleMapBuilder .of(String.class, (Class>) ((Class) List.class)).file(file). create()) { - assertEquals(defaultValue, map.get("c")); + assertEquals(defaultValue, map.acquireUsing("c", null)); } } finally { file.delete();