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 4472C189CB for ; Tue, 25 Aug 2015 08:57:14 +0000 (UTC) Received: (qmail 27623 invoked by uid 500); 25 Aug 2015 08:57:09 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 27503 invoked by uid 500); 25 Aug 2015 08:57:09 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 27066 invoked by uid 99); 25 Aug 2015 08:57:08 -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; Tue, 25 Aug 2015 08:57:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 99622E714D; Tue, 25 Aug 2015 08:57:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Tue, 25 Aug 2015 08:57:26 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [19/50] ignite git commit: Minor fixes. Minor fixes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/75aee089 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/75aee089 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/75aee089 Branch: refs/heads/ignite-1093 Commit: 75aee08902f4c38a2bc642051878fd8b52ed910b Parents: 7a96a4b Author: vozerov-gridgain Authored: Thu Aug 20 14:55:40 2015 +0300 Committer: vozerov-gridgain Committed: Thu Aug 20 14:55:40 2015 +0300 ---------------------------------------------------------------------- .../apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java | 2 +- .../test/java/org/apache/ignite/testframework/GridTestUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/75aee089/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java index ee95308..1393e50 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/util/nio/ssl/BlockingSslHandler.java @@ -461,7 +461,7 @@ public class BlockingSslHandler { int read = ch.read(inNetBuf); if (read == -1) - throw new IgniteCheckedException("Failed to read remote node ID (connection closed)."); + throw new IgniteCheckedException("Failed to read remote node response (connection closed)."); } catch (IOException e) { throw new IgniteCheckedException("Failed to write byte to socket.", e); http://git-wip-us.apache.org/repos/asf/ignite/blob/75aee089/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java index 964f680..d840312 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/GridTestUtils.java @@ -1353,7 +1353,7 @@ public final class GridTestUtils { U.resolveIgnitePath(GridTestProperties.getProperty("ssl.keystore.path")).getAbsolutePath()); factory.setKeyStorePassword(GridTestProperties.getProperty("ssl.keystore.password").toCharArray()); - factory.setTrustManagers(GridSslBasicContextFactory.getDisabledTrustManager()); + factory.setTrustManagers(SslContextFactory.getDisabledTrustManager()); return factory; }