Merge pull request #1895

d3aaf740 Partial fix #1876, check thread in block_txn_start() (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-03-19 23:02:32 +02:00
commit dbfbd3b698
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD

View File

@ -2503,7 +2503,8 @@ void BlockchainLMDB::block_txn_start(bool readonly)
throw0(DB_ERROR_TXN_START(lmdb_error("Failed to create a transaction for the db: ", mdb_res).c_str())); throw0(DB_ERROR_TXN_START(lmdb_error("Failed to create a transaction for the db: ", mdb_res).c_str()));
} }
memset(&m_wcursors, 0, sizeof(m_wcursors)); memset(&m_wcursors, 0, sizeof(m_wcursors));
} } else if (m_writer != boost::this_thread::get_id())
throw0(DB_ERROR_TXN_START((std::string("Attempted to start new write txn when batch txn already exists in ")+__FUNCTION__).c_str()));
} }
void BlockchainLMDB::block_txn_stop() void BlockchainLMDB::block_txn_stop()