Merge branch 'develop' of github.com:jedmccaleb/NewCoin into develop

This commit is contained in:
Arthur Britto
2013-05-05 20:45:04 -07:00
144 changed files with 27657 additions and 10 deletions

View File

@@ -929,7 +929,8 @@ void LedgerAcquireMaster::gotLedgerData(Job&, uint256 hash,
if (!ledger)
{
cLog(lsTRACE) << "Got data for ledger we're not acquiring";
peer->punishPeer(LT_InvalidRequest);
if (peer)
peer->punishPeer(LT_InvalidRequest);
return;
}
ledger->noAwaitData();