From 5f21490861e2162b1afafa38d05f47b604d915c0 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Thu, 10 May 2012 16:15:57 -0700 Subject: [PATCH] Fix ledger acquire node handling bug. --- src/LedgerAcquire.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/LedgerAcquire.cpp b/src/LedgerAcquire.cpp index 28bdf83ae..2100641b2 100644 --- a/src/LedgerAcquire.cpp +++ b/src/LedgerAcquire.cpp @@ -243,7 +243,12 @@ bool LedgerAcquire::takeTxNode(const std::list& nodeIDs, std::list >::const_iterator nodeDatait = data.begin(); while (nodeIDit != nodeIDs.end()) { - if (!mLedger->peekTransactionMap()->addKnownNode(*nodeIDit, *nodeDatait)) + if (nodeIDit->isRoot()) + { + if (!mLedger->peekTransactionMap()->addRootNode(mLedger->getTransHash(), *nodeDatait)) + return false; + } + else if (!mLedger->peekTransactionMap()->addKnownNode(*nodeIDit, *nodeDatait)) return false; ++nodeIDit; ++nodeDatait; @@ -263,7 +268,12 @@ bool LedgerAcquire::takeAsNode(const std::list& nodeIDs, std::list >::const_iterator nodeDatait = data.begin(); while (nodeIDit != nodeIDs.end()) { - if (!mLedger->peekAccountStateMap()->addKnownNode(*nodeIDit, *nodeDatait)) + if (nodeIDit->isRoot()) + { + if (!mLedger->peekAccountStateMap()->addRootNode(mLedger->getAccountHash(), *nodeDatait)) + return false; + } + else if (!mLedger->peekAccountStateMap()->addKnownNode(*nodeIDit, *nodeDatait)) return false; ++nodeIDit; ++nodeDatait;