From a698c5846e75e4e87799158d4c59ae50b5a26070 Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Wed, 21 Jan 2015 16:45:03 +0100 Subject: [PATCH] Peer: invoke disconnection handlers on timeout even if we didn't successfully connect yet. --- core/src/main/java/org/bitcoinj/core/Peer.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core/src/main/java/org/bitcoinj/core/Peer.java b/core/src/main/java/org/bitcoinj/core/Peer.java index 137a209d..56ec4322 100644 --- a/core/src/main/java/org/bitcoinj/core/Peer.java +++ b/core/src/main/java/org/bitcoinj/core/Peer.java @@ -276,6 +276,14 @@ public class Peer extends PeerSocketHandler { } } + @Override + protected void timeoutOccurred() { + super.timeoutOccurred(); + if (!connectionOpenFuture.isDone()) { + connectionClosed(); // Invoke the event handlers to tell listeners e.g. PeerGroup that we never managed to connect. + } + } + @Override public void connectionClosed() { for (final PeerListenerRegistration registration : eventListeners) {