Merge branch 'master' of github.com:jedmccaleb/NewCoin

This commit is contained in:
Arthur Britto
2012-06-04 12:20:00 -07:00
15 changed files with 179 additions and 97 deletions

View File

@@ -291,6 +291,7 @@ TransactionEngineResult TransactionEngine::applyTransaction(const SerializedTran
std::cerr << "applyTransaction>" << std::endl;
mLedger = mDefaultLedger;
assert(mLedger);
if (mAlternateLedger && (targetLedger != 0) &&
(targetLedger != mLedger->getLedgerSeq()) && (targetLedger == mAlternateLedger->getLedgerSeq()))
{