From fca9a4abe4cdce2d25cf0a1f1f52df7ba0fc3454 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 6 Jul 2013 12:35:18 -0700 Subject: [PATCH] Fix some possible cases where a node could be marked as full below when it shouldn't be. --- src/cpp/ripple/ripple_SHAMapSync.cpp | 8 -------- src/cpp/ripple/ripple_SHAMapTreeNode.cpp | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/cpp/ripple/ripple_SHAMapSync.cpp b/src/cpp/ripple/ripple_SHAMapSync.cpp index 0f58ea7c7..b4ee5c33c 100644 --- a/src/cpp/ripple/ripple_SHAMapSync.cpp +++ b/src/cpp/ripple/ripple_SHAMapSync.cpp @@ -77,12 +77,8 @@ void SHAMap::getMissingNodes (std::vector& nodeIDs, std::vectorsetFullBelow (); - if (mType == smtSTATE) - { fullBelowCache.add (node->getNodeHash ()); - dropBelow (node); - } } } @@ -148,12 +144,8 @@ std::vector SHAMap::getNeededHashes (int max, SHAMapSyncFilter* filter) if (have_all) { node->setFullBelow (); - if (mType == smtSTATE) - { fullBelowCache.add (node->getNodeHash ()); - dropBelow (node); - } } } diff --git a/src/cpp/ripple/ripple_SHAMapTreeNode.cpp b/src/cpp/ripple/ripple_SHAMapTreeNode.cpp index 1398ea5d0..7b9ac447d 100644 --- a/src/cpp/ripple/ripple_SHAMapTreeNode.cpp +++ b/src/cpp/ripple/ripple_SHAMapTreeNode.cpp @@ -19,7 +19,7 @@ SHAMapTreeNode::SHAMapTreeNode (const SHAMapTreeNode& node, uint32 seq) : SHAMap } SHAMapTreeNode::SHAMapTreeNode (const SHAMapNode& node, SHAMapItem::ref item, TNType type, uint32 seq) : - SHAMapNode (node), mItem (item), mSeq (seq), mType (type), mIsBranch (0), mFullBelow (true) + SHAMapNode (node), mItem (item), mSeq (seq), mType (type), mIsBranch (0), mFullBelow (false) { assert (item->peekData ().size () >= 12); updateHash ();