From: JINMEI Tatuya <jinmei@isc.org>
Date: Wed, 12 Dec 2012 22:04:54 +0000 (-0800)
Subject: [2470] provide RR collator with issue callbacks
X-Git-Tag: bind10-1.0.0-beta-release~15^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=822fa31524fc37af1ffdd265f8554fb9d85471f1;p=thirdparty%2Fkea.git

[2470] provide RR collator with issue callbacks
---

diff --git a/src/lib/datasrc/memory/zone_data_loader.cc b/src/lib/datasrc/memory/zone_data_loader.cc
index e224224219..02380931a7 100644
--- a/src/lib/datasrc/memory/zone_data_loader.cc
+++ b/src/lib/datasrc/memory/zone_data_loader.cc
@@ -193,12 +193,12 @@ masterLoaderWrapper(const char* const filename, const Name& origin,
                     const RRClass& zone_class, LoadCallback callback)
 {
     bool load_ok = false;       // (we don't use it)
-    dns::RRCollator collator(boost::bind(callback, _1));
+    const MasterLoaderCallbacks issue_callbacks =
+        createMasterLoaderCallbacks(origin, zone_class, &load_ok);
+    dns::RRCollator collator(boost::bind(callback, _1), issue_callbacks);
 
     try {
-        dns::MasterLoader(filename, origin, zone_class,
-                          createMasterLoaderCallbacks(origin, zone_class,
-                                                      &load_ok),
+        dns::MasterLoader(filename, origin, zone_class, issue_callbacks,
                           collator.getCallback()).load();
         collator.flush();
     } catch (const dns::MasterLoaderError& e) {