Tighten scope of the FileInputStream in WalletAppKit to avoid lock co…

…llisions on Windows. Resolves issue 556.
bitcoinj · May 13, 2014 · acebe8e · acebe8e
1 parent 408bca3
commit acebe8e
Showing 1 changed file with 10 additions and 9 deletions.
diff --git a/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java b/core/src/main/java/com/google/bitcoin/kits/WalletAppKit.java
@@ -189,7 +189,6 @@ protected void startUp() throws Exception {
                 throw new IOException("Could not create named directory.");
             }
         }
-        FileInputStream walletStream = null;
         try {
             File chainFile = new File(directory, filePrefix + ".spvchain");
             boolean chainFileExists = chainFile.exists();
@@ -216,12 +215,16 @@ protected void startUp() throws Exception {
             if (this.userAgent != null)
                 vPeerGroup.setUserAgent(userAgent, version);
             if (vWalletFile.exists()) {
-                walletStream = new FileInputStream(vWalletFile);
-                vWallet = new Wallet(params);
-                addWalletExtensions(); // All extensions must be present before we deserialize
-                new WalletProtobufSerializer().readWallet(WalletProtobufSerializer.parseToProto(walletStream), vWallet);
-                if (shouldReplayWallet)
-                    vWallet.clearTransactions(0);
+                FileInputStream walletStream = new FileInputStream(vWalletFile);
+                try {
+                    vWallet = new Wallet(params);
+                    addWalletExtensions(); // All extensions must be present before we deserialize
+                    new WalletProtobufSerializer().readWallet(WalletProtobufSerializer.parseToProto(walletStream), vWallet);
+                    if (shouldReplayWallet)
+                        vWallet.clearTransactions(0);
+                } finally {
+                    walletStream.close();
+                }
             } else {
                 vWallet = new Wallet(params);
                 vWallet.addKey(new ECKey());
@@ -270,8 +273,6 @@ public void failed(State from, Throwable failure) {
             }
         } catch (BlockStoreException e) {
             throw new IOException(e);
-        } finally {
-            if (walletStream != null) walletStream.close();
         }
     }