From 4544fe6c830a786be01d73e2fa1b1f386235d43c Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Tue, 23 Feb 2016 01:46:35 +0100
Subject: [PATCH] Add check for outbound connections at socket creation

---
 .../io/bitsquare/p2p/network/NetworkNode.java  | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java b/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java
index aaf7f95481..d90fd25c1a 100644
--- a/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java
+++ b/network/src/main/java/io/bitsquare/p2p/network/NetworkNode.java
@@ -89,20 +89,24 @@ public abstract class NetworkNode implements MessageListener, ConnectionListener
                         throw new TimeoutException("A timeout occurred when creating a socket.");
 
                     // Tor needs sometimes quite long to create a connection. To avoid that we get too many double 
-                    // sided connections we check again if we still don't have an incoming connection.
-                    Connection inboundConnection = getInboundConnection(peersNodeAddress);
-                    if (inboundConnection != null) {
-                        log.info("We found in the meantime an inbound connection for peersNodeAddress {}, " +
+                    // sided connections we check again if we still don't have any connection for that node address.
+                    Connection existingConnection = getInboundConnection(peersNodeAddress);
+                    if (existingConnection != null)
+                        existingConnection = getOutboundConnection(peersNodeAddress);
+
+                    if (existingConnection != null) {
+                        log.info("We found in the meantime a connection for peersNodeAddress {}, " +
                                         "so we use that for sending the message.\n" +
-                                        "That happens when Tor needs long for creating a new outbound connection.",
+                                        "That can happen if Tor needs long for creating a new outbound connection.\n" +
+                                        "We might have got a new inbound or outbound connection.",
                                 peersNodeAddress.getFullAddress());
                         try {
                             socket.close();
                         } catch (Throwable throwable) {
                             log.error("Error at closing socket " + throwable);
                         }
-                        inboundConnection.sendMessage(message);
-                        return inboundConnection;
+                        existingConnection.sendMessage(message);
+                        return existingConnection;
                     } else {
                         outboundConnection = new OutboundConnection(socket, NetworkNode.this, NetworkNode.this, peersNodeAddress);
                         outBoundConnections.add(outboundConnection);