ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge fixes from other branch.

Browse Source
This commit is contained in:
David Schwartz
2013-07-25 00:13:47 -07:00
parent 83dbb341ca
commit d04bf6b9d0
1 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/cpp/ripple/ripple_LedgerEntrySet.cpp
View File

@@ -679,24 +679,9 @@ TER LedgerEntrySet::dirAdd (
}
else
{
// Have old last point to new node, if it was not root.
if (uNodeDir == 1)
{
// Previous node is root node.
sleRoot->setFieldU64 (sfIndexNext, uNodeDir);
}
else
{
// Previous node is not root node.
SLE::pointer slePrevious = entryCache (ltDIR_NODE, Ledger::getDirNodeIndex (uRootIndex, uNodeDir - 1));
slePrevious->setFieldU64 (sfIndexNext, uNodeDir);
entryModify (slePrevious);
sleNode->setFieldU64 (sfIndexPrevious, uNodeDir - 1);
}
// Have old last point to new node
sleNode->setFieldU64(sfIndexNext, uNodeDir);
entryModify(sleNode);
// Have root point to new node.
sleRoot->setFieldU64 (sfIndexPrevious, uNodeDir);
@@ -704,6 +689,8 @@ TER LedgerEntrySet::dirAdd (
// Create the new node.
sleNode = entryCreate (ltDIR_NODE, Ledger::getDirNodeIndex (uRootIndex, uNodeDir));
if (uNodeDir != 1)
sleNode->setFieldU64(sfIndexPrevious, uNodeDir - 1);
sleNode->setFieldH256 (sfRootIndex, uRootIndex);
fDescriber (sleNode);
@@ -893,6 +880,8 @@ TER LedgerEntrySet::dirDelete (
// Fix next to point to its new previous.
sleNext->setFieldU64 (sfIndexPrevious, uNodePrevious);
entryModify (sleNext);
entryDelete(sleNode);
}
// Last node.
else if (bKeepRoot || uNodePrevious)