From: Mukund Sivaraman <muks@isc.org>
Date: Mon, 2 Sep 2013 05:01:59 +0000 (+0530)
Subject: [2750] Update some checks
X-Git-Tag: bind10-1.2.0beta1-release~193^2~4^2~40
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a07912bb6cb95f4df5caffdc6df4b07219b5dc3;p=thirdparty%2Fkea.git

[2750] Update some checks
---

diff --git a/src/lib/datasrc/memory/domaintree.h b/src/lib/datasrc/memory/domaintree.h
index 75a98389e4..1fc14a025b 100644
--- 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()))
         {