BIND 10 trac2267, updated. b117859663685e898c085750bc7a0908dc42e489 [2267] unify the call to addRdataSet.

[BIND 10 source code commits]

The branch, trac2267 has been updated
       via  b117859663685e898c085750bc7a0908dc42e489 (commit)
      from  5784101c08e8318a6e88bea598cf2a7ac5a389c3 (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 b117859663685e898c085750bc7a0908dc42e489
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Sep 19 09:47:13 2012 -0700

    [2267] unify the call to addRdataSet.
    
    as suggested in review.

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

Summary of changes:
 src/lib/datasrc/memory/memory_client.cc |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index 46999df..50ad775 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -456,17 +456,14 @@ public:
         LOG_DEBUG(logger, DBG_TRACE_DATA, DATASRC_MEMORY_MEM_ADD_RRSET).
             arg(rrset->getName()).arg(rrset->getType()).arg(zone_name);
 
-        if (rrset->getType() == RRType::NSEC3()) {
-            addRdataSet(zone_name, zone_data, rrset, sig_rrset);
-            return;
-        }
-
         // Add wildcards possibly contained in the owner name to the domain
-        // tree.
+        // tree.  This can only happen for the normal (non-NSEC3) tree.
         // Note: this can throw an exception, breaking strong exception
         // guarantee.  (see also the note for the call to contextCheck()
         // above).
-        addWildcards(zone_name, zone_data, rrset->getName());
+        if (rrset->getType() != RRType::NSEC3()) {
+            addWildcards(zone_name, zone_data, rrset->getName());
+        }
 
         addRdataSet(zone_name, zone_data, rrset, sig_rrset);