From ceae998bee09b776b45640ebf9d9f7aa4d4be0c6 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Thu, 21 Jan 2016 13:03:38 +0100
Subject: [PATCH] Fix nullpointer, fix wrong hash at arb. select.

---
 .../trade/protocol/trade/ArbitrationSelectionRule.java         | 3 ++-
 .../main/java/io/bitsquare/gui/popups/EmptyWalletPopup.java    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/ArbitrationSelectionRule.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/ArbitrationSelectionRule.java
index e7a9658c1d..43a7de4f08 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/ArbitrationSelectionRule.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/ArbitrationSelectionRule.java
@@ -24,6 +24,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -39,7 +40,7 @@ public class ArbitrationSelectionRule {
         }
         checkArgument(candidates.size() > 0, "candidates.size() <= 0");
 
-        int index = Math.abs(Sha256Hash.hash(offer.getId().getBytes()).hashCode()) % candidates.size();
+        int index = Math.abs(Arrays.hashCode(Sha256Hash.hash(offer.getId().getBytes()))) % candidates.size();
         NodeAddress selectedArbitrator = candidates.get(index);
         log.debug("selectedArbitrator " + selectedArbitrator);
         return selectedArbitrator;
diff --git a/gui/src/main/java/io/bitsquare/gui/popups/EmptyWalletPopup.java b/gui/src/main/java/io/bitsquare/gui/popups/EmptyWalletPopup.java
index 2a6aee13c4..80d6fd91bf 100644
--- a/gui/src/main/java/io/bitsquare/gui/popups/EmptyWalletPopup.java
+++ b/gui/src/main/java/io/bitsquare/gui/popups/EmptyWalletPopup.java
@@ -101,7 +101,6 @@ public class EmptyWalletPopup extends Popup {
         emptyWalletButton = new Button("Empty wallet");
         boolean isBalanceSufficient = Restrictions.isAboveDust(totalBalance);
         emptyWalletButton.setDefaultButton(isBalanceSufficient);
-        closeButton.setDefaultButton(!isBalanceSufficient);
         emptyWalletButton.setDisable(!isBalanceSufficient && addressInputTextField.getText().length() > 0);
         emptyWalletButton.setOnAction(e -> {
             if (addressInputTextField.getText().length() > 0 && isBalanceSufficient) {
@@ -121,6 +120,7 @@ public class EmptyWalletPopup extends Popup {
             hide();
             closeHandlerOptional.ifPresent(closeHandler -> closeHandler.run());
         });
+        closeButton.setDefaultButton(!isBalanceSufficient);
 
         HBox hBox = new HBox();
         hBox.setSpacing(10);