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 branch 'master' of github.com:jedmccaleb/NewCoin

Browse Source 
Conflicts:
	src/main.cpp
This commit is contained in:
jed
2012-05-15 16:58:21 -07:00
parent 79020f96ef a9429083b6
commit d34a274daf
6 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/SHAMap.cpp
View File

@@ -521,12 +521,12 @@ bool SHAMap::updateGiveItem(SHAMapItem::pointer item, bool isTransaction)
boost::recursive_mutex::scoped_lock sl(mLock);
std::stack<SHAMapTreeNode::pointer> stack = getStack(tag, true);
if(stack.empty()) throw SHAMapException(MissingNode);
if (stack.empty()) throw SHAMapException(MissingNode);
SHAMapTreeNode::pointer node=stack.top();
stack.pop();
if (!node->isLeaf() || (node->peekItem()->getTag() == tag) )
if (!node->isLeaf() || (node->peekItem()->getTag() != tag) )
{
assert(false);
return false;