Qortal/altcoinj
1
0
Fork 1
mirror of https://github.com/Qortal/altcoinj.git synced 2025-11-02 05:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing potential deadlock by enforcing keychain > extensions order.

Browse Source 
Brought about by fix in 5181cefcf2.
This commit is contained in:
Michael Bell
2015-06-01 23:53:43 +01:00
committed by Mike Hearn
parent caa294c7f6
commit 9b82c69946
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/bitcoinj/core/Wallet.java
View File

@@ -4462,6 +4462,7 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
*/
public void deserializeExtension(WalletExtension extension, byte[] data) throws Exception {
lock.lock();
keychainLock.lock();
try {
// This method exists partly to establish a lock ordering of wallet > extension.
extension.deserializeWalletExtension(this, data);
@@ -4471,6 +4472,7 @@ public class Wallet extends BaseTaggableObject implements Serializable, BlockCha
extensions.remove(extension.getWalletExtensionID());
Throwables.propagate(throwable);
} finally {
keychainLock.unlock();
lock.unlock();
}
}