Bugfixes.

This commit is contained in:
JoelKatz
2012-05-31 21:22:38 -07:00
parent 11e7aafd08
commit 46bfa149d1
2 changed files with 11 additions and 5 deletions

View File

@@ -1,9 +1,11 @@
#include "Ledger.h"
#include "utils.h"
#include <boost/make_shared.hpp>
#include "utils.h"
#include "Log.h"
LedgerStateParms Ledger::writeBack(LedgerStateParms parms, SerializedLedgerEntry::pointer entry)
{
ScopedLock l(mAccountStateMap->Lock());
@@ -13,9 +15,7 @@ LedgerStateParms Ledger::writeBack(LedgerStateParms parms, SerializedLedgerEntry
{
if ((parms & lepCREATE) == 0)
{
#ifdef DEBUG
std::cerr << "writeBack no create" << std::endl;
#endif
Log(lsERROR) << "WriteBack non-existent node without create";
return lepMISSING;
}
create = true;

View File

@@ -1,4 +1,6 @@
#include "SHAMap.h"
#include <stack>
#include <boost/foreach.hpp>
@@ -9,7 +11,7 @@
#include "Serializer.h"
#include "BitcoinUtil.h"
#include "SHAMap.h"
#include "Log.h"
SHAMap::SHAMap(uint32 seq) : mSeq(seq), mState(Modifying)
{
@@ -570,7 +572,11 @@ bool SHAMap::updateGiveItem(SHAMapItem::pointer item, bool isTransaction)
returnNode(node, true);
if (!node->setItem(item, isTransaction ? SHAMapTreeNode::tnTRANSACTION : SHAMapTreeNode::tnACCOUNT_STATE))
{
Log(lsFATAL) << "SHAMap setItem fails";
assert(false);
return false;
}
dirtyUp(stack, tag, node->getNodeHash());
return true;