diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:33:41 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:33:41 -0800 |
| commit | 23cf9633325693b363a608f3021270231640d848 (patch) | |
| tree | b8c45ab85881215e43376e0935e74fe18bd67ec8 /src/cryptonote_core/blockchain.cpp | |
| parent | Merge pull request #1491 (diff) | |
| parent | blockchain: allow marking "tx not found" without an exception (diff) | |
| download | monero-23cf9633325693b363a608f3021270231640d848.tar.xz | |
Merge pull request #1493
0478ac68 blockchain: allow marking "tx not found" without an exception (moneromooo-monero)
Diffstat (limited to 'src/cryptonote_core/blockchain.cpp')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 42279184a..39fd0f6f1 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -1895,11 +1895,11 @@ bool Blockchain::get_transactions(const t_ids_container& txs_ids, t_tx_container { try { - txs.push_back(m_db->get_tx(tx_hash)); - } - catch (const TX_DNE& e) - { - missed_txs.push_back(tx_hash); + transaction tx; + if (m_db->get_tx(tx_hash, tx)) + txs.push_back(std::move(tx)); + else + missed_txs.push_back(tx_hash); } catch (const std::exception& e) { |