BIND 10 trac2435_2, updated. 1bb3b6b661cc500b2a7cad2447347a23b7b1fadc [2435] Use the returned RRsetCollection instead of using a static cast

[BIND 10 source code commits]

The branch, trac2435_2 has been updated
       via  1bb3b6b661cc500b2a7cad2447347a23b7b1fadc (commit)
       via  d5a2bb8d02bb017405ac6f79e2eeffcb7fd23052 (commit)
       via  9de5d287390383e072dbb2c4cbf9d60253893e41 (commit)
      from  2887502a9e0084cb16c79aba684a65f9d4fda69a (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 1bb3b6b661cc500b2a7cad2447347a23b7b1fadc
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jan 18 18:36:00 2013 +0530

    [2435] Use the returned RRsetCollection instead of using a static cast

commit d5a2bb8d02bb017405ac6f79e2eeffcb7fd23052
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jan 18 18:31:44 2013 +0530

    [2435] Remove destructor

commit 9de5d287390383e072dbb2c4cbf9d60253893e41
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Jan 18 18:31:05 2013 +0530

    [2435] Fix class comment

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

Summary of changes:
 src/lib/datasrc/database.cc                |    5 +----
 src/lib/datasrc/tests/database_unittest.cc |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 6 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/database.cc b/src/lib/datasrc/database.cc
index 0b010a4..4b5b8d1 100644
--- a/src/lib/datasrc/database.cc
+++ b/src/lib/datasrc/database.cc
@@ -1385,7 +1385,7 @@ DatabaseClient::getIterator(const isc::dns::Name& name,
     return (iterator);
 }
 
-/// \brief datasrc implementation of RRsetCollectionBase.
+/// \brief Database implementation of RRsetCollectionBase.
 class RRsetCollection : public isc::datasrc::RRsetCollectionBase {
 public:
     /// \brief Constructor.
@@ -1393,9 +1393,6 @@ public:
         isc::datasrc::RRsetCollectionBase(updater, rrclass)
     {}
 
-    /// \brief Destructor
-    virtual ~RRsetCollection() {}
-
     /// \brief A wrapper around \c disable() so that it can be used as a
     /// public method. \c disable() is protected.
     void disableWrapper() {
diff --git a/src/lib/datasrc/tests/database_unittest.cc b/src/lib/datasrc/tests/database_unittest.cc
index 9f5ade4..6b12b3a 100644
--- a/src/lib/datasrc/tests/database_unittest.cc
+++ b/src/lib/datasrc/tests/database_unittest.cc
@@ -4389,7 +4389,12 @@ TYPED_TEST(RRsetCollectionAndUpdaterTest, updateThrows) {
     // Now setup a new updater and call getRRsetCollection() on it.
     this->updater_.reset();
     this->updater_ = this->client_->getUpdater(this->zname_, false);
-    (void) this->updater_->getRRsetCollection();
+
+    // Just call getRRsetCollection() here. The .find() is unnecessary,
+    // but we have it to use the result of getRRsetCollection().
+    this->updater_->getRRsetCollection().find(Name("www.example.org"),
+                                              RRClass::IN(),
+                                              RRType::MX());
 
     // addRRset() must throw isc::InvalidOperation here.
     EXPECT_THROW(this->updater_->addRRset(*this->rrset_),
@@ -4407,7 +4412,12 @@ TYPED_TEST(RRsetCollectionAndUpdaterTest, updateThrows) {
     this->updater_.reset();
     this->updater_ = this->client_->getUpdater(this->zname_, false);
     this->updater_->addRRset(*this->rrset_);
-    (void) this->updater_->getRRsetCollection();
+
+    // Just call getRRsetCollection() here. The .find() is unnecessary,
+    // but we have it to use the result of getRRsetCollection().
+    this->updater_->getRRsetCollection().find(Name("www.example.org"),
+                                              RRClass::IN(),
+                                              RRType::MX());
 
     // deleteRRset() must throw isc::InvalidOperation here.
     EXPECT_THROW(this->updater_->deleteRRset(*this->rrset_),