Merge pull request #2396

dbfef643 tx_pool: catch exceptions in LockedTXN dtor (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-09-14 18:25:28 +02:00
commit 718820cd96
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -92,7 +92,7 @@ namespace cryptonote
LockedTXN(Blockchain &b): m_blockchain(b), m_batch(false) { LockedTXN(Blockchain &b): m_blockchain(b), m_batch(false) {
m_batch = m_blockchain.get_db().batch_start(); m_batch = m_blockchain.get_db().batch_start();
} }
~LockedTXN() { if (m_batch) { m_blockchain.get_db().batch_stop(); } } ~LockedTXN() { try { if (m_batch) { m_blockchain.get_db().batch_stop(); } } catch (const std::exception &e) { MWARNING("LockedTXN dtor filtering exception: " << e.what()); } }
private: private:
Blockchain &m_blockchain; Blockchain &m_blockchain;
bool m_batch; bool m_batch;