ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [19/50] ignite git commit: Minor fixes.
Date Tue, 25 Aug 2015 08:57:26 GMT
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 <vozerov@gridgain.com>
Authored: Thu Aug 20 14:55:40 2015 +0300
Committer: vozerov-gridgain <vozerov@gridgain.com>
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;
     }


Mime
View raw message