Merge remote-tracking branch 'upstream/master' into rebase

This commit is contained in:
langerhans
2015-01-06 20:52:03 +01:00

View File

@@ -375,7 +375,7 @@ public class WalletAppKit extends AbstractIdleService {
serializer = new WalletProtobufSerializer(); serializer = new WalletProtobufSerializer();
wallet = serializer.readWallet(params, extArray, proto); wallet = serializer.readWallet(params, extArray, proto);
if (shouldReplayWallet) if (shouldReplayWallet)
wallet.clearTransactions(0); wallet.reset();
} finally { } finally {
walletStream.close(); walletStream.close();
} }