BIND 10 trac2436, updated. f8fb3f6f2f6f42888be0cd4e8c9df9502c944081 [2436] Rephrase a TODO comment

[BIND 10 source code commits]

The branch, trac2436 has been updated
       via  f8fb3f6f2f6f42888be0cd4e8c9df9502c944081 (commit)
       via  29e27da67a1558281a52a5a1c233db3bf84efcb3 (commit)
      from  2dbb441195792e760669119ea99e945f66a71a69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f8fb3f6f2f6f42888be0cd4e8c9df9502c944081
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Jan 10 16:23:13 2013 +0100

    [2436] Rephrase a TODO comment
    
    So it is a little bit clearer.

commit 29e27da67a1558281a52a5a1c233db3bf84efcb3
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu Jan 10 16:16:18 2013 +0100

    [2436] Use a reference
    
    According to the standard, it is safe here. So we save ourselves a copy.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/datasrc/tests/zone_loader_unittest.cc |   10 ++++++----
 src/lib/datasrc/zone_loader.cc                |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/tests/zone_loader_unittest.cc b/src/lib/datasrc/tests/zone_loader_unittest.cc
index 3c5e502..1f6f07e 100644
--- a/src/lib/datasrc/tests/zone_loader_unittest.cc
+++ b/src/lib/datasrc/tests/zone_loader_unittest.cc
@@ -186,10 +186,12 @@ protected:
     {}
     void prepareSource(const Name& zone, const char* filename) {
         // TODO:
-        // Currently, load uses an implementation unrelated to the ZoneLoader.
-        // In the long term, the method will probably be deprecated. At that
-        // time, we should probably prepare the data in some other way (using
-        // sqlite3 or something). This is simpler for now.
+        // Currently, source_client_ is of InMemoryClient and its load()
+        // uses a different code than the ZoneLoader (so we can cross-check
+        // the implementations). Currently, the load() doesn't perform any
+        // post-load checks. It will change in #2499, at which point the
+        // loading may start failing depending on details of the test data. We
+        // should prepare the data by some different method then.
         source_client_.load(zone, string(TEST_DATA_DIR) + "/" + filename);
     }
 private:
diff --git a/src/lib/datasrc/zone_loader.cc b/src/lib/datasrc/zone_loader.cc
index fb098ba..5d93921 100644
--- a/src/lib/datasrc/zone_loader.cc
+++ b/src/lib/datasrc/zone_loader.cc
@@ -150,8 +150,8 @@ ZoneLoader::loadIncremental(size_t limit) {
     if (complete_) {
         // Everything is loaded. Perform some basic sanity checks on the zone.
         RRsetCollection collection(updater_);
-        const dns::Name zone_name(updater_->getFinder().getOrigin());
-        const dns::RRClass zone_class(updater_->getFinder().getClass());
+        const dns::Name& zone_name(updater_->getFinder().getOrigin());
+        const dns::RRClass& zone_class(updater_->getFinder().getClass());
         const dns::ZoneCheckerCallbacks
             callbacks(boost::bind(&logError, &zone_name, &zone_class, _1),
                       boost::bind(&logWarning, &zone_name, &zone_class, _1));