BIND 10 trac2750, updated. bd9f2d3c9e45d945b8e6ad9db79f93954ee0dcf9 [2750] Rename method

[BIND 10 source code commits]

The branch, trac2750 has been updated
       via  bd9f2d3c9e45d945b8e6ad9db79f93954ee0dcf9 (commit)
       via  52d44bc5004ae501ca039896db099b734781f00b (commit)
      from  339f201e9a6c58980f8cc9e6577e80254f04e951 (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 bd9f2d3c9e45d945b8e6ad9db79f93954ee0dcf9
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 18 15:25:59 2013 +0530

    [2750] Rename method

commit 52d44bc5004ae501ca039896db099b734781f00b
Author: Mukund Sivaraman <muks at isc.org>
Date:   Wed Sep 18 15:23:59 2013 +0530

    [2750] Invert condition statement, swapping respective blocks
    
    ... for better readability.

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

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

-----------------------------------------------------------------------
diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h
index aa29828..727f54a 100644
--- a/src/lib/datasrc/memory/domaintree.h
+++ b/src/lib/datasrc/memory/domaintree.h
@@ -625,12 +625,12 @@ private:
         return (down_.get());
     }
 
-    /// \brief Helper method used in many places in code to set
-    /// parent-child links.
-    void setParentChild(DomainTreeNode<T>* oldnode,
-                        DomainTreeNode<T>* newnode,
-                        DomainTreeNodePtr* root_ptr,
-                        DomainTreeNode<T>* thisnode = NULL)
+    /// \brief Helper method used in many places in code to set parent's
+    /// child links.
+    void connectChild(DomainTreeNode<T>* oldnode,
+                      DomainTreeNode<T>* newnode,
+                      DomainTreeNodePtr* root_ptr,
+                      DomainTreeNode<T>* thisnode = NULL)
     {
         if (!thisnode) {
             thisnode = this;
@@ -698,7 +698,7 @@ private:
         setSubTreeRoot(lower_is_subtree_root);
         lower->setSubTreeRoot(this_is_subtree_root);
 
-        lower->setParentChild(this, lower, root_ptr);
+        lower->connectChild(this, lower, root_ptr);
 
         if (getParent()->getLeft() == lower) {
             getParent()->left_ = this;
@@ -2319,15 +2319,15 @@ DomainTree<T>::remove(util::MemorySegment& mem_sgmt, DomainTreeNode<T>* node,
         // right or left child definitely doesn't exist (and is NULL).
         // Pick the child node, or if no children exist, just use NULL.
         DomainTreeNode<T>* child;
-        if (!node->getRight()) {
-            child = node->getLeft();
-        } else {
+        if (node->getRight()) {
             child = node->getRight();
+        } else {
+            child = node->getLeft();
         }
 
         // Set it as the node's parent's child, effectively removing
         // node from the tree.
-        node->setParentChild(node, child, &root_);
+        node->connectChild(node, child, &root_);
 
         // Child can be NULL here if node was a leaf.
         if (child) {
@@ -2424,7 +2424,7 @@ DomainTree<T>::nodeFission(util::MemorySegment& mem_sgmt,
 
     up_node->parent_ = node.getParent();
 
-    node.setParentChild(&node, up_node, &root_);
+    node.connectChild(&node, up_node, &root_);
 
     up_node->down_ = &node;
     node.parent_ = up_node;