BIND 10 trac2309, updated. a333e6c631fd02410295adfac58d8681c635f782 [2309] made findAtOrigin virtual again, removing the Impl protected method.

[BIND 10 source code commits]

The branch, trac2309 has been updated
       via  a333e6c631fd02410295adfac58d8681c635f782 (commit)
       via  3c7af17b0022c2404e22618bb46682991c7e6a3c (commit)
      from  bc66f6d0df259657efc39b87f33e68dd08062202 (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 a333e6c631fd02410295adfac58d8681c635f782
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Jan 23 08:08:31 2013 -0800

    [2309] made findAtOrigin virtual again, removing the Impl protected method.
    
    as this seemed to be a controversial move.

commit 3c7af17b0022c2404e22618bb46682991c7e6a3c
Author: JINMEI Tatuya <jinmei at isc.org>
Date:   Wed Jan 23 08:03:18 2013 -0800

    [2309] editorial fix to comment: missing period

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

Summary of changes:
 src/bin/auth/query.cc          |    4 ++--
 src/lib/datasrc/zone_finder.cc |    4 ++--
 src/lib/datasrc/zone_finder.h  |   27 ++++++---------------------
 3 files changed, 10 insertions(+), 25 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/query.cc b/src/bin/auth/query.cc
index 99fc19c..a2a4117 100644
--- a/src/bin/auth/query.cc
+++ b/src/bin/auth/query.cc
@@ -102,8 +102,8 @@ Query::ResponseCreator::create(Message& response,
 void
 Query::addSOA(ZoneFinder& finder) {
     // This method is always called in finding SOA for a negative response,
-    // so we specify the use of min(RRTTL SOA MINTTL) as specified Section 3
-    // of RFC2308.
+    // so we specify the use of min(RRTTL, SOA MINTTL) as specified in
+    // Section 3 of RFC2308.
     ZoneFinderContextPtr soa_ctx = finder.findAtOrigin(RRType::SOA(), true,
                                                        dnssec_opt_);
     if (soa_ctx->code != ZoneFinder::SUCCESS) {
diff --git a/src/lib/datasrc/zone_finder.cc b/src/lib/datasrc/zone_finder.cc
index e2f9812..b4240c0 100644
--- a/src/lib/datasrc/zone_finder.cc
+++ b/src/lib/datasrc/zone_finder.cc
@@ -83,8 +83,8 @@ copyRRset(const AbstractRRset& rrset, const RRTTL& ttl) {
 }
 
 ZoneFinderContextPtr
-ZoneFinder::findAtOriginImpl(const dns::RRType& type, bool use_minttl,
-                             FindOptions options)
+ZoneFinder::findAtOrigin(const dns::RRType& type, bool use_minttl,
+                         FindOptions options)
 {
     ZoneFinderContextPtr context = find(getOrigin(), type, options);
 
diff --git a/src/lib/datasrc/zone_finder.h b/src/lib/datasrc/zone_finder.h
index 11bc5ed..6e1cee0 100644
--- a/src/lib/datasrc/zone_finder.h
+++ b/src/lib/datasrc/zone_finder.h
@@ -583,7 +583,7 @@ public:
     ///
     /// In terms of API this method is equivalent to a call to \c find() where
     /// the \c name parameter is the zone origin (return value of
-    /// \c getOrigin()) and is redundant.  This method is provided as a
+    /// \c getOrigin()) and is redundant.  This method is provided as an
     /// optimization point for some kind of finder implementations that can
     /// exploit the fact that the query name is the zone origin and for
     /// applications that want to possibly benefit from such implementations.
@@ -611,10 +611,10 @@ public:
     /// much faster if the need for it is known beforehand.
     ///
     /// If the underlying finder implementation wants to optimize these cases,
-    /// it can do so by overriding the \c findAtOriginImpl() protected method.
-    /// It has the default implementation for any other implementations, which
-    /// should work for any finder implementation as long as it conforms to
-    /// other public interfaces.
+    /// it can do so by specializing the method.  It has the default
+    /// implementation for any other implementations, which should work for
+    /// any finder implementation as long as it conforms to other public
+    /// interfaces.
     ///
     /// So, an implementation of a finder does not have to care about this
     /// method unless it sees the need for optimizing the behavior.
@@ -632,22 +632,7 @@ public:
     ///
     /// \return A \c FindContext object enclosing the search result.
     ///         See \c find().
-    boost::shared_ptr<Context> findAtOrigin(
-        const isc::dns::RRType& type, bool use_minttl,
-        FindOptions options)
-    {
-        return (findAtOriginImpl(type, use_minttl, options));
-    }
-
-protected:
-    /// \brief Actual implementation of \c findAtOrigin().
-    ///
-    /// This is separated from the public \c findAtOrigin() method so that
-    /// the interface can be changed (if and when necessary) without affecting
-    /// the user applications of the public method.  It has the default
-    /// implementation; normally the specific derived class does not have to
-    /// override it.
-    virtual boost::shared_ptr<Context> findAtOriginImpl(
+    virtual boost::shared_ptr<Context> findAtOrigin(
         const isc::dns::RRType& type, bool use_minttl,
         FindOptions options);