BIND 10 trac2750, updated. d79db92249d8e529bd8346cffbaf5c19680923f5 [2750] Handle root of forest case too

[BIND 10 source code commits]

The branch, trac2750 has been updated
       via  d79db92249d8e529bd8346cffbaf5c19680923f5 (commit)
      from  3984b23014333a678d3c78f8253312bede64a213 (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 d79db92249d8e529bd8346cffbaf5c19680923f5
Author: Mukund Sivaraman <muks at isc.org>
Date:   Fri Sep 6 11:36:44 2013 +0530

    [2750] Handle root of forest case too

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

Summary of changes:
 src/lib/datasrc/memory/domaintree.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h
index af080e2..f7ab4ea 100644
--- a/src/lib/datasrc/memory/domaintree.h
+++ b/src/lib/datasrc/memory/domaintree.h
@@ -2322,7 +2322,7 @@ DomainTree<T>::remove(util::MemorySegment& mem_sgmt, DomainTreeNode<T>* node,
         // Even if node is not a leaf node, we don't always do an
         // exchange() with another node, so we have to set the child's
         // FLAG_SUBTREE_ROOT explicitly.
-        if (child->getParent() &&
+        if ((!child->getParent()) ||
             (child->getParent()->getDown() == child))
         {
             child->setSubTreeRoot(node->isSubTreeRoot());
@@ -2953,8 +2953,8 @@ DomainTree<T>::checkPropertiesHelper(const DomainTreeNode<T>* node) const {
 
     // If node is assigned to the down_ pointer of its parent, it is a
     // subtree root and must have the flag set.
-    if (node->getParent() &&
-        (node->getParent()->getDown() == node) &&
+    if (((!node->getParent()) ||
+         (node->getParent()->getDown() == node)) &&
         (!node->isSubTreeRoot()))
     {
         return (false);