Repository: incubator-ignite Updated Branches: refs/heads/ignite-1.3.3 dd92a5a07 -> 26112a8ed
minor Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26112a8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26112a8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26112a8e Branch: refs/heads/ignite-1.3.3 Commit: 26112a8ed2dc828b6e47fab7158ee6a5728e7516 Parents: dd92a5a Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Jul 22 15:46:20 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Jul 22 15:46:20 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/processors/cache/GridCacheAdapter.java | 2 +- .../apache/ignite/spi/communication/tcp/TcpCommunicationSpi.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26112a8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index e138520..18f4004 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -1627,7 +1627,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V ) { ctx.checkSecurity(SecurityPermission.CACHE_READ); - if (keyCheck) + if (keyCheck) validateCacheKeys(keys); return getAllAsync0(ctx.cacheKeysView(keys), http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/26112a8e/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 b72299e..99ca2b7 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 @@ -2052,6 +2052,7 @@ public class TcpCommunicationSpi extends IgniteSpiAdapter long rcvCnt = -1; GridTuple<SSLEngine> ssl = new GridTuple<>(); + try { ch.socket().connect(addr, (int)connTimeout);
