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 F1BA1185B6 for ; Fri, 21 Aug 2015 09:05:00 +0000 (UTC) Received: (qmail 68105 invoked by uid 500); 21 Aug 2015 09:05:00 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 68070 invoked by uid 500); 21 Aug 2015 09:05:00 -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 68058 invoked by uid 99); 21 Aug 2015 09:05:00 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 21 Aug 2015 09:05:00 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 53DCB1AA90F for ; Fri, 21 Aug 2015 09:05:00 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.775 X-Spam-Level: * X-Spam-Status: No, score=1.775 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.006, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id KHJbaC0uDS1G for ; Fri, 21 Aug 2015 09:04:59 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 0F2922543A for ; Fri, 21 Aug 2015 09:04:50 +0000 (UTC) Received: (qmail 66926 invoked by uid 99); 21 Aug 2015 09:04:47 -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; Fri, 21 Aug 2015 09:04:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7520AE71A5; Fri, 21 Aug 2015 09:04:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.incubator.apache.org Date: Fri, 21 Aug 2015 09:05:13 -0000 Message-Id: In-Reply-To: <779fb856b3ed494ea4064fff6d37aa26@git.apache.org> References: <779fb856b3ed494ea4064fff6d37aa26@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/44] incubator-ignite git commit: Minor fixes. Minor fixes. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/75aee089 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/75aee089 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/75aee089 Branch: refs/heads/ignite-gg-9615-1 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/incubator-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/incubator-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; }