[2750] Update some checks

diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h
index 75a98389e413370dc840bc7bd28b02e44d314060..1fc14a025bd40d297db424080e48f88e029878b3 100644 (file)
--- a/src/lib/datasrc/memory/domaintree.h
+++ b/src/lib/datasrc/memory/domaintree.h
@@ -2682,8 +2682,10 @@ DomainTree<T>::removeRebalance
         sibling = (parent->getLeft() == child) ?
             parent->getRight() : parent->getLeft();
 
+        // NOTE: From above, sibling must be BLACK here.
+        assert(sibling->isBlack());
+
         if (parent->isBlack() &&
-            sibling->isBlack() &&
             ((!sibling->getLeft()) || sibling->getLeft()->isBlack()) &&
             ((!sibling->getRight()) || sibling->getRight()->isBlack()))
         {
@@ -2692,9 +2694,7 @@ DomainTree<T>::removeRebalance
             continue;
         }
 
-        // FIXME: Can't sibling be NULL here?
         if (parent->isRed() &&
-            sibling->isBlack() &&
             ((!sibling->getLeft()) || sibling->getLeft()->isBlack()) &&
             ((!sibling->getRight()) || sibling->getRight()->isBlack()))
         {