Upgrade to Guava 16.0.1.

Resolves issue 375.
This commit is contained in:
Andreas Schildbach
2014-04-06 15:54:17 +02:00
committed by Mike Hearn
parent 9a54a7753d
commit 6087e43377
24 changed files with 210 additions and 82 deletions

View File

@@ -37,7 +37,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>13.0</version>
<version>16.0.1</version>
</dependency>
<dependency>
<groupId>com.aquafx-project</groupId>

View File

@@ -92,8 +92,9 @@ public class Main extends Application {
// or progress widget to keep the user engaged whilst we initialise, but we don't.
bitcoin.setDownloadListener(controller.progressBarUpdater())
.setBlockingStartup(false)
.setUserAgent(APP_NAME, "1.0")
.startAndWait();
.setUserAgent(APP_NAME, "1.0");
bitcoin.startAsync();
bitcoin.awaitRunning();
// Don't make the user wait for confirmations for now, as the intention is they're sending it their own money!
bitcoin.wallet().allowSpendingUnconfirmedTransactions();
bitcoin.peerGroup().setMaxConnections(11);
@@ -162,7 +163,8 @@ public class Main extends Application {
@Override
public void stop() throws Exception {
bitcoin.stopAndWait();
bitcoin.stopAsync();
bitcoin.awaitTerminated();
super.stop();
}