From b235beb56b44d22f054398e84ed94b72d2ddbde7 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 18 Nov 2015 16:43:28 +0100
Subject: [PATCH] fix bug with map

---
 .../src/main/java/io/bitsquare/arbitration/Arbitrator.java | 7 ++++++-
 .../src/main/java/io/bitsquare/p2p/network/Connection.java | 3 ++-
 .../p2p/storage/ProtectedExpirableDataStorage.java         | 3 ++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java b/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
index 2afb425114..765d9e0470 100644
--- a/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
+++ b/core/src/main/java/io/bitsquare/arbitration/Arbitrator.java
@@ -145,9 +145,14 @@ public final class Arbitrator implements PubKeyProtectedExpirablePayload {
     @Override
     public String toString() {
         return "Arbitrator{" +
-                "arbitratorAddress='" + arbitratorAddress + '\'' +
+                "arbitratorAddress=" + arbitratorAddress +
                 ", languageCodes=" + languageCodes +
                 ", btcAddress='" + btcAddress + '\'' +
+                ", registrationDate=" + registrationDate +
+                ", btcPubKey.hashCode()=" + Arrays.toString(btcPubKey).hashCode() +
+                ", pubKeyRing.hashCode()=" + pubKeyRing.hashCode() +
+                ", registrationSignature.hashCode()='" + registrationSignature.hashCode() + '\'' +
+                ", registrationPubKey.hashCode()=" + Arrays.toString(registrationPubKey).hashCode() +
                 '}';
     }
 }
diff --git a/network/src/main/java/io/bitsquare/p2p/network/Connection.java b/network/src/main/java/io/bitsquare/p2p/network/Connection.java
index a70f7b585e..8552846586 100644
--- a/network/src/main/java/io/bitsquare/p2p/network/Connection.java
+++ b/network/src/main/java/io/bitsquare/p2p/network/Connection.java
@@ -30,7 +30,8 @@ import java.util.concurrent.*;
 public class Connection implements MessageListener {
     private static final Logger log = LoggerFactory.getLogger(Connection.class);
     private static final int MAX_MSG_SIZE = 5 * 1024 * 1024;         // 5 MB of compressed data
-    private static final int SOCKET_TIMEOUT = 30 * 60 * 1000;        // 30 min.
+    //timeout on blocking Socket operations like ServerSocket.accept() or SocketInputStream.read()
+    private static final int SOCKET_TIMEOUT = 1 * 60 * 1000;        // 1 min.
     private ConnectionPriority connectionPriority;
 
     public static int getMaxMsgSize() {
diff --git a/network/src/main/java/io/bitsquare/p2p/storage/ProtectedExpirableDataStorage.java b/network/src/main/java/io/bitsquare/p2p/storage/ProtectedExpirableDataStorage.java
index 5966a84412..49a4f7c34d 100644
--- a/network/src/main/java/io/bitsquare/p2p/storage/ProtectedExpirableDataStorage.java
+++ b/network/src/main/java/io/bitsquare/p2p/storage/ProtectedExpirableDataStorage.java
@@ -95,7 +95,8 @@ public class ProtectedExpirableDataStorage implements MessageListener {
         // object when we get it sent from new peers, we don’t remove the sequence number from the map. 
         // That way a add message for an already expired data will fail because the sequence number 
         // is equal and not larger. 
-        map.entrySet().stream()
+        Map<ByteArray, ProtectedData> temp = new HashMap<>(map);
+        temp.entrySet().stream()
                 .filter(entry -> entry.getValue().isExpired())
                 .forEach(entry -> map.remove(entry.getKey()));
     }