From a0e7a80bfcc1cc275db22a78ae3824dda10dd66b Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Fri, 22 May 2015 16:40:55 +0200
Subject: [PATCH] add timeout to shutdown handler, change timout for btc
 network connection lost

---
 core/src/main/java/io/bitsquare/btc/WalletService.java    | 8 +++++++-
 core/src/main/java/io/bitsquare/p2p/Node.java             | 4 ++--
 .../main/java/io/bitsquare/gui/main/MainViewModel.java    | 2 +-
 .../gui/main/settings/network/NetworkSettingsView.java    | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/btc/WalletService.java b/core/src/main/java/io/bitsquare/btc/WalletService.java
index c959e5cdf1..f81cd335b1 100644
--- a/core/src/main/java/io/bitsquare/btc/WalletService.java
+++ b/core/src/main/java/io/bitsquare/btc/WalletService.java
@@ -68,6 +68,7 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.stream.Collectors;
 
 import javax.annotation.Nullable;
@@ -280,7 +281,12 @@ public class WalletService {
             wallet.removeEventListener(walletEventListener);
         if (walletAppKit != null) {
             walletAppKit.stopAsync();
-            walletAppKit.awaitTerminated();
+            try {
+                walletAppKit.awaitTerminated(5, TimeUnit.SECONDS);
+            } catch (TimeoutException e) {
+                e.printStackTrace();
+                log.error("walletAppKit.awaitTerminated not terminated after 5 sec. Error message: " + e.getMessage());
+            }
         }
     }
 
diff --git a/core/src/main/java/io/bitsquare/p2p/Node.java b/core/src/main/java/io/bitsquare/p2p/Node.java
index 83f2a9b09f..19d76c5ae5 100644
--- a/core/src/main/java/io/bitsquare/p2p/Node.java
+++ b/core/src/main/java/io/bitsquare/p2p/Node.java
@@ -157,7 +157,7 @@ public final class Node {
     public String toString() {
         return "Name='" + name + '\'' +
                 "; IP='" + ip + '\'' +
-                "; P2P network ID=" + p2pId +
-                "; port=" + port;
+                "; port=" + port +
+                "; P2P network ID=" + p2pId;
     }
 }
diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
index 33fb632764..7be53a49d7 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -67,7 +67,7 @@ class MainViewModel implements ViewModel {
 
     private static final long BLOCKCHAIN_SYNC_TIMEOUT = 60000;
     private static final long LOST_P2P_CONNECTION_TIMEOUT = 5000;
-    private static final long LOST_BTC_CONNECTION_TIMEOUT = 2000;
+    private static final long LOST_BTC_CONNECTION_TIMEOUT = 5000;
 
     private final User user;
     private final KeyRing keyRing;
diff --git a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
index 248fed6e1f..ca4811998d 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/settings/network/NetworkSettingsView.java
@@ -150,7 +150,7 @@ public class NetworkSettingsView extends InitializableView {
         });
 
         Action response = Popups.openConfirmPopup("Info", "You need to restart the application to apply the change of the Bitcoin network.",
-                "Do you want to shutdown now?", actions);
+                "Do you want to restart now?", actions);
 
         if (Popups.isYes(response))
             BitsquareApp.restartDownHandler.run();