IGNITE-323 Removed ATTR_SSL.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4c5a663a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4c5a663a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4c5a663a Branch: refs/heads/ignite-323 Commit: 4c5a663af93bc1dfcbe99e9473e999c49c049822 Parents: 39053e1 Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Tue Jul 21 19:08:32 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Tue Jul 21 19:08:32 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/util/lang/GridFunc.java | 32 -------------------- .../communication/tcp/TcpCommunicationSpi.java | 6 +--- 2 files changed, 1 insertion(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c5a663a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java index 506cc96..f3bcab0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/lang/GridFunc.java @@ -3967,38 +3967,6 @@ public class GridFunc { } /** - * Creates map with given values. - * - * @param k1 Key 1. - * @param v1 Value 1. - * @param k2 Key 2. - * @param v2 Value 2. - * @param k3 Key 3. - * @param v3 Value 3. - * @param k4 Key 4. - * @param v4 Value 4. - * @param k5 Key 5. - * @param v5 Value 5. - * @param k6 Key 6. - * @param v6 Value 6. - * @param <K> Key's type. - * @param <V> Value's type. - * @return Created map. - */ - public static <K, V> Map<K, V> asMap(K k1, V v1, K k2, V v2, K k3, V v3, K k4, V v4, K k5, V v5, K k6, V v6) { - Map<K, V> map = new GridLeanMap<>(5); - - map.put(k1, v1); - map.put(k2, v2); - map.put(k3, v3); - map.put(k4, v4); - map.put(k5, v5); - map.put(k6, v6); - - return map; - } - - /** * Convenience method to convert multiple elements into array. * * @param t Elements to convert into array. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4c5a663a/modules/core/src/main/java/org/apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java ---------------------------------------------------------------------- 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 index c13ae76..36b8ee4 100644 --- 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 @@ -148,9 +148,6 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter public static final String OUT_OF_RESOURCES_TCP_MSG = "Failed to allocate shared memory segment " + "(switching to TCP, may be slower)."; - /** Node attribute that is set if using SSL (value is <tt>comm.tcp.ssl</tt>). */ - public static final String ATTR_SSL = "comm.tcp.ssl"; - /** Node attribute that is mapped to node IP addresses (value is <tt>comm.tcp.addrs</tt>). */ public static final String ATTR_ADDRS = "comm.tcp.addrs"; @@ -1335,8 +1332,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter createSpiAttributeName(ATTR_HOST_NAMES), addrs.get2(), createSpiAttributeName(ATTR_PORT), boundTcpPort, createSpiAttributeName(ATTR_SHMEM_PORT), boundTcpShmemPort >= 0 ? boundTcpShmemPort : null, - createSpiAttributeName(ATTR_EXT_ADDRS), extAddrs, - createSpiAttributeName(ATTR_SSL), isSslEnabled()); + createSpiAttributeName(ATTR_EXT_ADDRS), extAddrs); } catch (IOException | IgniteCheckedException e) { throw new IgniteSpiException("Failed to resolve local host to addresses: " + locHost, e);
