From: Michal 'vorner' Vaner <michal.vaner@nic.cz>
Date: Thu, 16 May 2013 14:21:31 +0000 (+0200)
Subject: [2836] Call resetHeader at better times
X-Git-Tag: bind10-1.2.0beta1-release~457^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b47d98c888f29facede10aecc8bf4d39d8f21ce;p=thirdparty%2Fkea.git

[2836] Call resetHeader at better times
---

diff --git a/src/lib/datasrc/memory/zone_writer.cc b/src/lib/datasrc/memory/zone_writer.cc
index e3c9039e4e..a2b1ac7533 100644
--- a/src/lib/datasrc/memory/zone_writer.cc
+++ b/src/lib/datasrc/memory/zone_writer.cc
@@ -54,14 +54,13 @@ ZoneWriter::load() {
     }
 
     zone_data_ = load_action_(segment_.getMemorySegment());
+    segment_.resetHeader();
 
     if (!zone_data_) {
         // Bug inside load_action_.
         isc_throw(isc::InvalidOperation, "No data returned from load action");
     }
 
-    segment_.resetHeader();
-
     state_ = ZW_LOADED;
 }
 
@@ -86,11 +85,10 @@ ZoneWriter::install() {
                                                   zone_data_));
             state_ = ZW_INSTALLED;
             zone_data_ = result.zone_data;
-        } catch (const isc::util::MemorySegmentGrown&) {
-        }
-    }
+        } catch (const isc::util::MemorySegmentGrown&) {}
 
-    segment_.resetHeader();
+        segment_.resetHeader();
+    }
 }
 
 void