Merge remote-tracking branch 'community/ignite-2.1.1' into ignite-2.1.1

apache · Jun 13, 2017 · 2300ec4 · 2300ec4
2 parents fb2e6d4 + dea416f
commit 2300ec4
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java b/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java
@@ -2931,22 +2931,9 @@ protected GridCommunicationClient createTcpClient(ClusterNode node, int connIdx)
 
         // Try to connect first on bound addresses.
         if (isRmtAddrsExist) {
-            boolean sameHost = U.sameMacs(getSpiContext().localNode(), node);
-
-            List<InetSocketAddress> addrs0;
-
-            Collection<InetSocketAddress> socketAddrs = U.toSocketAddresses(rmtAddrs0, rmtHostNames0, boundPort);
-
-            if (sameHost)
-                addrs0 = new ArrayList<>(socketAddrs);
-            else {
-                addrs0 = new ArrayList<>(socketAddrs.size());
+            List<InetSocketAddress> addrs0 = new ArrayList<>(U.toSocketAddresses(rmtAddrs0, rmtHostNames0, boundPort));
 
-                for (InetSocketAddress addr0 : socketAddrs) {
-                    if (!addr0.getAddress().isLoopbackAddress())
-                        addrs0.add(addr0);
-                }
-            }
+            boolean sameHost = U.sameMacs(getSpiContext().localNode(), node);
 
             Collections.sort(addrs0, U.inetAddressesComparator(sameHost));