Commit fdefb47d authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[1332] fixed a bug in the previous update to the test: termination condtion

was wrong.
parent 93a5d45d
...@@ -1072,7 +1072,9 @@ public: ...@@ -1072,7 +1072,9 @@ public:
ASSERT_TRUE(jnl_reader); ASSERT_TRUE(jnl_reader);
ConstRRsetPtr rrset; ConstRRsetPtr rrset;
vector<JournalEntry>::const_iterator it = expected.begin(); vector<JournalEntry>::const_iterator it = expected.begin();
while ((rrset = jnl_reader->getNextDiff()) != NULL) { for (rrset = jnl_reader->getNextDiff();
rrset && it != expected.end();
rrset = jnl_reader->getNextDiff(), ++it) {
typedef DatabaseAccessor Accessor; typedef DatabaseAccessor Accessor;
RRsetPtr expected_rrset( RRsetPtr expected_rrset(
new RRset(Name((*it).data_[Accessor::DIFF_NAME]), new RRset(Name((*it).data_[Accessor::DIFF_NAME]),
...@@ -1084,10 +1086,6 @@ public: ...@@ -1084,10 +1086,6 @@ public:
expected_rrset->getClass(), expected_rrset->getClass(),
(*it).data_[Accessor::DIFF_RDATA])); (*it).data_[Accessor::DIFF_RDATA]));
isc::testutils::rrsetCheck(expected_rrset, rrset); isc::testutils::rrsetCheck(expected_rrset, rrset);
++it;
if (it == expected.end()) {
break;
}
} }
// We should have examined all entries of both expected and // We should have examined all entries of both expected and
// actual data. // actual data.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment