From: Mukund Sivaraman <muks@isc.org>
Date: Sun, 29 Jul 2012 20:09:15 +0000 (+0530)
Subject: Merge branch 'master' into trac2106
X-Git-Tag: trac2351_base~158^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8fa723bfd4e41dca1c398dfc1350b419d50facea;p=thirdparty%2Fkea.git

Merge branch 'master' into trac2106
---

8fa723bfd4e41dca1c398dfc1350b419d50facea
diff --cc src/lib/datasrc/rbtree.h
index 6a86524dd5,771f23e3c8..38086db235
--- a/src/lib/datasrc/rbtree.h
+++ b/src/lib/datasrc/rbtree.h
@@@ -1345,9 -1322,9 +1355,9 @@@ RBTree<T>::find(const isc::dns::LabelSe
  
      RBNode<T>* node = root_.get();
      Result ret = NOTFOUND;
 -    dns::LabelSequence target_labels(target_name);
 +    dns::LabelSequence target_labels(target_labels_orig);
  
-     while (node != NULLNODE) {
+     while (node != NULL) {
          node_path.last_compared_ = node;
          node_path.last_comparison_ = target_labels.compare(node->getLabels());
          const isc::dns::NameComparisonResult::NameRelation relation =