diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-09-14 18:25:28 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-09-14 18:25:28 +0200 |
| commit | 718820cd9658d0c9e14cb619c542ace4988fb629 (patch) | |
| tree | 65889e069c57d506fc4d271dfd6b29671baab554 /src/cryptonote_core | |
| parent | Merge pull request #2392 (diff) | |
| parent | tx_pool: catch exceptions in LockedTXN dtor (diff) | |
| download | monero-718820cd9658d0c9e14cb619c542ace4988fb629.tar.xz | |
Merge pull request #2396
dbfef643 tx_pool: catch exceptions in LockedTXN dtor (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 68e0b556f..e61d95ac3 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -92,7 +92,7 @@ namespace cryptonote LockedTXN(Blockchain &b): m_blockchain(b), m_batch(false) { 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: Blockchain &m_blockchain; bool m_batch; |