From 059b8960622f2ee82776810a6d2acfc752214c06 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Mon, 23 Sep 2013 16:53:36 +0200 Subject: [PATCH] Wallet: another re-org fix. --- core/src/main/java/com/google/bitcoin/core/Wallet.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/google/bitcoin/core/Wallet.java b/core/src/main/java/com/google/bitcoin/core/Wallet.java index d85bc6c9..5ea187a3 100644 --- a/core/src/main/java/com/google/bitcoin/core/Wallet.java +++ b/core/src/main/java/com/google/bitcoin/core/Wallet.java @@ -515,9 +515,11 @@ public class Wallet implements Serializable, BlockChainListener, PeerFilterProvi BlockChain.NewBlockType blockType) throws VerificationException { lock.lock(); try { - Transaction tx = pending.get(txHash); - if (tx == null) + Transaction tx = transactions.get(txHash); + if (tx == null) { + log.error("TX {} not found despite being sent to wallet", txHash); return; + } receive(tx, block, blockType); } finally { lock.unlock();