[1384] check correct value when getting iterator

c41c32c1 · Jelte Jansen · 11a4fe2d · c41c32c1
Commit c41c32c1 authored Nov 16, 2011 by Jelte Jansen
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

src/lib/datasrc/memory_datasrc.cc src/lib/datasrc/memory_datasrc.cc +2 -4

No files found.
--- a/src/lib/datasrc/memory_datasrc.cc
+++ b/src/lib/datasrc/memory_datasrc.cc
@@ -751,10 +751,8 @@ public:
        // Initialize the iterator if there's somewhere to point to
        if (node_ != NULL && node_->getData() != DomainPtr()) {
            dom_iterator_ = node_->getData()->begin();
-            if (separate_rrs_) {
-                if (dom_iterator_->second != NULL) {
-                    rdata_iterator_ = dom_iterator_->second->getRdataIterator();
-                }
+            if (separate_rrs_ && dom_iterator_ != node_->getData()->end()) {
+                rdata_iterator_ = dom_iterator_->second->getRdataIterator();
            }
        }
    }