ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [25/50] [abbrv] ignite git commit: IGNITE-3054 - Merge with master
Date Mon, 24 Apr 2017 15:03:48 GMT
IGNITE-3054 - Merge with master


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d46f0ac4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d46f0ac4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d46f0ac4

Branch: refs/heads/ignite-3054
Commit: d46f0ac414ea9c1628a2def33c8b22923ad771cd
Parents: 8d50758
Author: dkarachentsev <dkarachentsev@gridgain.com>
Authored: Fri Dec 2 12:53:35 2016 +0300
Committer: dkarachentsev <dkarachentsev@gridgain.com>
Committed: Fri Dec 2 12:53:35 2016 +0300

----------------------------------------------------------------------
 .../main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java  | 2 +-
 .../processors/cache/distributed/IgniteCache150ClientsTest.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/d46f0ac4/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
index 931e162..e1798b5 100644
--- a/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/ServerImpl.java
@@ -5662,7 +5662,7 @@ class ServerImpl extends TcpDiscoveryImpl {
                 assert sock instanceof NioSslSocket;
 
                 // Put the engine to the meta map to allow nio server to use it:
-                meta.put(GridNioSessionMetaKey.SSL_ENGINE.ordinal(), ((NioSslSocket)sock).sslEngine);
+                meta.put(GridNioSessionMetaKey.SSL_META.ordinal(), ((NioSslSocket)sock).sslEngine);
             }
 
             ses = clientNioSrv.createSession(ch, meta).get();

http://git-wip-us.apache.org/repos/asf/ignite/blob/d46f0ac4/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
index 133bbf1..57d3176 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/IgniteCache150ClientsTest.java
@@ -191,4 +191,4 @@ public class IgniteCache150ClientsTest extends GridCommonAbstractTest
{
                 ignite.cluster().nodes().size());
         }
     }
-}
\ No newline at end of file
+}


Mime
View raw message