From f4f1f9f451866aa506a8e29e9db6c0198f22f13d Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Sun, 5 Apr 2015 16:59:28 +0200 Subject: [PATCH] Add null check --- core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java | 4 ++-- core/src/main/java/io/bitsquare/p2p/Node.java | 1 + .../io/bitsquare/p2p/tomp2p/TomP2PAddressService.java | 8 ++++++-- .../java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java | 5 ++++- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java index 3050718817..1aff0773c6 100644 --- a/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java +++ b/core/src/main/java/io/bitsquare/p2p/BootstrapNodes.java @@ -22,7 +22,7 @@ import java.util.List; public interface BootstrapNodes { - Node DIGITAL_OCEAN_1 = Node.at("digitalocean1.bitsquare.io", "188.226.179.109"); + Node DIGITAL_OCEAN_1 = Node.at("digitalocean1.bitsquare.io", "188.226.179.109", 7366); /** * Alias to the default bootstrap node. @@ -33,7 +33,7 @@ public interface BootstrapNodes { * A locally-running BootstrapNode instance. * Typically used only for testing. Not included in results from {@link #all()}. */ - Node LOCALHOST = Node.at("localhost", "127.0.0.1"); + Node LOCALHOST = Node.at("localhost", "127.0.0.1", 7366); /** * All known public bootstrap nodes. diff --git a/core/src/main/java/io/bitsquare/p2p/Node.java b/core/src/main/java/io/bitsquare/p2p/Node.java index c4fafd9560..78e81b7d98 100644 --- a/core/src/main/java/io/bitsquare/p2p/Node.java +++ b/core/src/main/java/io/bitsquare/p2p/Node.java @@ -85,6 +85,7 @@ public final class Node { try { ServerSocket server = new ServerSocket(0); port = server.getLocalPort(); + log.debug("Random system port used for client: {}", port); server.close(); } catch (IOException e) { e.printStackTrace(); diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java index f1012a1ebb..93b840fa93 100644 --- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java +++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PAddressService.java @@ -34,6 +34,7 @@ import javax.inject.Inject; import net.tomp2p.dht.FutureGet; import net.tomp2p.dht.FuturePut; +import net.tomp2p.dht.FutureRemove; import net.tomp2p.futures.BaseFuture; import net.tomp2p.futures.BaseFutureAdapter; import net.tomp2p.futures.BaseFutureListener; @@ -174,8 +175,11 @@ public class TomP2PAddressService extends TomP2PDHTService implements AddressSer private void removeAddress() { try { - boolean success = removeDataFromMyProtectedDomain(locationKey).awaitUninterruptibly(1000); - log.debug("removeDataFromMyProtectedDomain success=" + success); + FutureRemove futureRemove = removeDataFromMyProtectedDomain(locationKey); + if (futureRemove != null) { + boolean success = futureRemove.awaitUninterruptibly(1000); + log.debug("removeDataFromMyProtectedDomain success=" + success); + } } catch (Throwable t) { t.printStackTrace(); log.error(t.getMessage()); diff --git a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java index 7361fca1e6..c5844e10bd 100644 --- a/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java +++ b/core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PDHTService.java @@ -130,7 +130,10 @@ public class TomP2PDHTService extends TomP2PService implements DHTService { */ public FutureRemove removeDataFromMyProtectedDomain(Number160 locationKey) { log.trace("removeDataOfProtectedDomain"); - return peerDHT.remove(locationKey).domainKey(pubKeyHashForMyDomain).keyPair(keyPair).start(); + if (peerDHT != null) + return peerDHT.remove(locationKey).domainKey(pubKeyHashForMyDomain).keyPair(keyPair).start(); + else + return null; } /**