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

Dispatch peerHas to JobQueue

Browse Source
This commit is contained in:
JoelKatz
2014-01-11 00:38:43 -08:00
committed by David Schwartz
parent 809359e81e
commit ab8d7a86ae
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/ripple_app/consensus/LedgerConsensus.cpp
View File

@@ -789,20 +789,17 @@ public:
std::vector< boost::weak_ptr<Peer> >& set = mPeerData[hashSet];
BOOST_FOREACH (boost::weak_ptr<Peer>& iit, set)
if (iit.lock () == peer)
return false;
set.push_back (peer);
boost::unordered_map<uint256
, TransactionAcquire::pointer>::iterator acq
= mAcquiring.find (hashSet);
if (acq != mAcquiring.end ())
{ // make sure it doesn't go away
TransactionAcquire::pointer ta = acq->second;
ta->peerHas (peer);
}
getApp().getJobQueue().addJob(jtTXN_DATA, "peerHasTxnData",
std::bind(&TransactionAcquire::peerHas, acq->second, peer));
return true;
}

2
src/ripple_app/misc/NetworkOPs.cpp
View File

@@ -1563,7 +1563,7 @@ SHAMapAddNode NetworkOPsImp::gotTXData (const boost::shared_ptr<Peer>& peer, uin
bool NetworkOPsImp::hasTXSet (const boost::shared_ptr<Peer>& peer, uint256 const& set, protocol::TxSetStatus status)
{
if (!haveConsensusObject ())
if (mConsensus == nullptr)
{
m_journal.info << "Peer has TX set, not during consensus";
return false;