mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-02-24 14:50:57 +01:00
Code Issues Projects Releases Packages Wiki Activity

Wallet: take key chain lock not only wallet lock in getWatchedOutputs().

Browse source 
Flagged by the IntelliJ Inspector static analysis engine.
This commit is contained in:
Mike Hearn 2015-07-28 20:59:03 +02:00
parent b7c24c6196
commit d753d28ba5
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2600,6 +2600,7 @@ public class Wallet extends BaseTaggableObject implements BlockChainListener, Pe
*/ */
public List<TransactionOutput> getWatchedOutputs(boolean excludeImmatureCoinbases) { public List<TransactionOutput> getWatchedOutputs(boolean excludeImmatureCoinbases) {
lock.lock(); lock.lock();
keychainLock.lock();
try { try {
LinkedList<TransactionOutput> candidates = Lists.newLinkedList(); LinkedList<TransactionOutput> candidates = Lists.newLinkedList();
for (Transaction tx : Iterables.concat(unspent.values(), pending.values())) { for (Transaction tx : Iterables.concat(unspent.values(), pending.values())) {
@ -2617,6 +2618,7 @@ public class Wallet extends BaseTaggableObject implements BlockChainListener, Pe
} }
return candidates; return candidates;
} finally { } finally {
keychainLock.unlock();
lock.unlock(); lock.unlock();
} }
} }