gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1865 from obscuren/deadlock-chainmanager-fix

Browse Source 
core: deadlock in chainmanager after posting RemovedTransactionEvent
This commit is contained in:
Jeffrey Wilcke
2015-10-02 03:39:43 -07:00
parent 49ae538506 a6cc02f68f
commit 0d78f96205
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/chain_manager.go
View File

@@ -804,7 +804,9 @@ func (self *ChainManager) reorg(oldBlock, newBlock *types.Block) error {
DeleteReceipt(self.chainDb, tx.Hash()) DeleteReceipt(self.chainDb, tx.Hash())
DeleteTransaction(self.chainDb, tx.Hash()) DeleteTransaction(self.chainDb, tx.Hash())
} }
self.eventMux.Post(RemovedTransactionEvent{diff}) // Must be posted in a goroutine because of the transaction pool trying
// to acquire the chain manager lock
go self.eventMux.Post(RemovedTransactionEvent{diff})
return nil return nil
} }