From d772244dc96a8d1d55206e6033f9f37b030c54be Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Sat, 15 Feb 2014 09:59:46 +0100 Subject: [PATCH] Fix crash in case wallet is so inconsistent that even .toString() fails. --- core/src/main/java/com/google/bitcoin/core/Wallet.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 e5b25de6d..4761111df 100644 --- a/core/src/main/java/com/google/bitcoin/core/Wallet.java +++ b/core/src/main/java/com/google/bitcoin/core/Wallet.java @@ -531,7 +531,13 @@ public class Wallet implements Serializable, BlockChainListener, PeerFilterProvi } } - if (!success) log.error(toString()); + if (!success) { + try { + log.error(toString()); + } catch (RuntimeException x) { + log.error("Printing inconsistent wallet failed", x); + } + } return success; } finally { lock.unlock();