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

Flagged by the IntelliJ Inspector static analysis engine.
bitcoinj · Jul 28, 2015 · d753d28 · d753d28
1 parent b7c24c6
commit d753d28
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/core/src/main/java/org/bitcoinj/core/Wallet.java b/core/src/main/java/org/bitcoinj/core/Wallet.java
@@ -2600,6 +2600,7 @@ private void clearTransactions() {
      */
     public List<TransactionOutput> getWatchedOutputs(boolean excludeImmatureCoinbases) {
         lock.lock();
+        keychainLock.lock();
         try {
             LinkedList<TransactionOutput> candidates = Lists.newLinkedList();
             for (Transaction tx : Iterables.concat(unspent.values(), pending.values())) {
@@ -2617,6 +2618,7 @@ public List<TransactionOutput> getWatchedOutputs(boolean excludeImmatureCoinbase
             }
             return candidates;
         } finally {
+            keychainLock.unlock();
             lock.unlock();
         }
     }