From b85317c8f305b9cd2662aa5a3dc19ece262920b6 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 18 Nov 2014 23:44:41 +0100 Subject: [PATCH] Shutdown peer in BootstrappedPeerFactory in case of bootstrap is still in progress (#270)\n\n Te other shutdown call in TomP2PNode would not trigger a shutdown as the peer is null during bootstrap --- .../java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java | 8 ++++++++ src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java index 3e1cc05c5e..a4582cec31 100644 --- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java +++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PMessageModule.java @@ -23,6 +23,7 @@ import io.bitsquare.network.BootstrapNodes; import io.bitsquare.network.ClientNode; import io.bitsquare.network.Node; +import com.google.inject.Injector; import com.google.inject.name.Names; import javax.inject.Singleton; @@ -65,6 +66,13 @@ public class TomP2PMessageModule extends MessageModule { bind(BootstrappedPeerFactory.class).asEagerSingleton(); } + @Override + protected void doClose(Injector injector) { + super.doClose(injector); + + injector.getInstance(BootstrappedPeerFactory.class).shutDown(); + } + @Override protected Class messageService() { return TomP2PMessageService.class; diff --git a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java index bc36fdd062..7b10c3501b 100644 --- a/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java +++ b/src/main/java/io/bitsquare/msg/tomp2p/TomP2PNode.java @@ -152,8 +152,6 @@ public class TomP2PNode implements ClientNode { } public void shutDown() { - bootstrappedPeerFactory.shutDown(); - if (peerDHT != null) peerDHT.shutdown(); }