Fix a few cases where we reset the acquire timer when we should not.

This commit is contained in:
JoelKatz
2012-08-07 04:11:20 -07:00
parent 86b9597ddd
commit b4e63c3025
4 changed files with 17 additions and 18 deletions

View File

@@ -72,7 +72,7 @@ protected:
void done();
void onTimer();
void newPeer(Peer::pointer peer) { trigger(peer); }
void newPeer(Peer::pointer peer) { trigger(peer, false); }
boost::weak_ptr<PeerSet> pmDowncast();
@@ -92,7 +92,7 @@ public:
bool takeTxRootNode(const std::vector<unsigned char>& data);
bool takeAsNode(const std::list<SHAMapNode>& IDs, const std::list<std::vector<unsigned char> >& data);
bool takeAsRootNode(const std::vector<unsigned char>& data);
void trigger(Peer::pointer);
void trigger(Peer::pointer, bool timer);
};
class LedgerAcquireMaster