From 6d0b3050515e60eda7922f081ff8d3aa07136a90 Mon Sep 17 00:00:00 2001
From: leventov <leventov@ya.ru>
Date: Sat, 24 Jan 2015 16:02:58 +0700
Subject: [PATCH] Simplified putDefaultValue()

---
 .../net/openhft/chronicle/map/VanillaChronicleMap.java    | 8 +-------
 .../converters/StatelessChronicleMapConverter.java        | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
index fa11bcfb9..4ec2001f4 100755
--- a/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
+++ b/src/main/java/net/openhft/chronicle/map/VanillaChronicleMap.java
@@ -403,12 +403,7 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
 
     @Override
     void putDefaultValue(VanillaContext context) {
-        context.initPutDependencies();
-        context.initInstanceValueModel0();
-        context.initNewInstanceValue0(defaultValue(context));
-        context.put0();
-        context.closeValueModel();
-        context.closeValue();
+        context.doPut(defaultValue(context));
     }
 
     @Override
@@ -509,7 +504,6 @@ class VanillaChronicleMap<K, KI, MKI extends MetaBytesInterop<K, ? super KI>,
         try {
             if (!c.containsKey()) {
                 c.doPut(defaultValue(c));
-                c.closeValue();
             }
             V value = c.getUsing(usingValue);
             if (value != usingValue) {
diff --git a/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java b/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java
index e7752d253..adc1616b2 100644
--- a/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java
+++ b/src/main/java/net/openhft/xstream/converters/StatelessChronicleMapConverter.java
@@ -45,7 +45,8 @@ public class StatelessChronicleMapConverter<K, V> extends AbstractChronicleMapCo
 
         try {
 
-            final Method entrySize = o.getClass().getDeclaredMethod("entrySet", MapEntryCallback.class);
+            final Method entrySize = o.getClass()
+                    .getDeclaredMethod("entrySet", MapEntryCallback.class);
             entrySize.setAccessible(true);
             entrySize.invoke(o,