Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 959CC18960 for ; Mon, 27 Jul 2015 20:10:49 +0000 (UTC) Received: (qmail 14640 invoked by uid 500); 27 Jul 2015 20:10:49 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 14610 invoked by uid 500); 27 Jul 2015 20:10:49 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 14601 invoked by uid 99); 27 Jul 2015 20:10:49 -0000 Received: from Unknown (HELO spamd3-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2015 20:10:49 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd3-us-west.apache.org (ASF Mail Server at spamd3-us-west.apache.org) with ESMTP id DD7FA191378 for ; Mon, 27 Jul 2015 20:10:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd3-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd3-us-west.apache.org [10.40.0.10]) (amavisd-new, port 10024) with ESMTP id zENntK8VMb-I for ; Mon, 27 Jul 2015 20:10:36 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 719EC5065C for ; Mon, 27 Jul 2015 20:10:27 +0000 (UTC) Received: (qmail 12488 invoked by uid 99); 27 Jul 2015 20:10:26 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jul 2015 20:10:26 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BA5EFE0AFA; Mon, 27 Jul 2015 20:10:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Mon, 27 Jul 2015 20:10:39 -0000 Message-Id: <4ff1875638c14ad48205be146635f15c@git.apache.org> In-Reply-To: <1e065320cc6a4e40b703574381aefe45@git.apache.org> References: <1e065320cc6a4e40b703574381aefe45@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [14/50] [abbrv] incubator-ignite git commit: minor 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-104 Commit: 26112a8ed2dc828b6e47fab7158ee6a5728e7516 Parents: dd92a5a Author: Yakov Zhdanov Authored: Wed Jul 22 15:46:20 2015 +0300 Committer: Yakov Zhdanov 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 implements IgniteInternalCache ssl = new GridTuple<>(); + try { ch.socket().connect(addr, (int)connTimeout);