ARCHIVE/xahaud
3
0
Fork 0
mirror of https://github.com/Xahau/xahaud.git synced 2025-12-06 17:27:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

SHAMap::canonicalize must return a node with the correct ID

Browse Source
This commit is contained in:
JoelKatz
2014-05-11 21:31:41 -07:00
committed by Vinnie Falco
parent 1434695c47
commit eed66894db
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/ripple_app/shamap/SHAMap.cpp
View File

@@ -1307,7 +1307,21 @@ SHAMapTreeNode::pointer SHAMap::getCache (uint256 const& hash, SHAMapNode const&
void SHAMap::canonicalize (uint256 const& hash, SHAMapTreeNode::pointer& node)
{
assert (node->getSeq() == 0);
SHAMapNode id = *node;
treeNodeCache.canonicalize (hash, node);
if (id != *node)
{
// The cache has the node with a different ID
node = boost::make_shared <SHAMapTreeNode> (*node, 0);
node->set (id);
// Future fetches are likely to use the newer ID
treeNodeCache.canonicalize (hash, node, true);
assert (id == *node);
}
}
//------------------------------------------------------------------------------