From 775227b90212dabe26cd195cd57befd1f171f517 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 12 Jun 2016 12:46:12 +0200 Subject: [PATCH] Enable doRemoveProtectedExpirableData again on close connection --- .../src/main/java/io/bitsquare/p2p/peers/PeerManager.java | 5 ----- .../main/java/io/bitsquare/p2p/storage/P2PDataStorage.java | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java b/network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java index f426914698..9486e9b470 100644 --- a/network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java +++ b/network/src/main/java/io/bitsquare/p2p/peers/PeerManager.java @@ -51,11 +51,6 @@ public class PeerManager implements ConnectionListener { maxConnectionsPeer = maxConnections + 4; maxConnectionsNonDirect = maxConnections + 8; maxConnectionsAbsolute = maxConnections + 18; - - if (DevFlags.STRESS_TEST_MODE) - System.err.println(new SimpleDateFormat("HH:mm:ss.SSS").format(new Date()) + - " - maxConnections = " + maxConnections + - " / maxConnectionsAbsolute = " + maxConnectionsAbsolute); } diff --git a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java index 2132c086be..44eab5b566 100644 --- a/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java +++ b/network/src/main/java/io/bitsquare/p2p/storage/P2PDataStorage.java @@ -169,9 +169,9 @@ public class P2PDataStorage implements MessageListener, ConnectionListener { " / isIntended=" + closeConnectionReason.isIntended + " / Memory(MB): " + Profiler.getUsedMemory()); - // TODO We get closeConnectionReason TERMINATED which removes offers which should nto be removed + // TODO We get closeConnectionReason TERMINATED which removes offers which should not be removed // TODO investigate why EOFException happens - //doRemoveProtectedExpirableData(protectedData, hashOfPayload); + doRemoveProtectedExpirableData(protectedData, hashOfPayload); } else { log.debug("Remove data ignored as we don't have an entry for that data.");