Repository: incubator-geode
Updated Branches:
  refs/heads/develop dbdf6fe1a -> 3d0dc7492


GEODE-1908 DS.connect call not configuring p2p server with SSL.

Before initializing the ssl server socket we make sure all config
has been taken care.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3d0dc749
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3d0dc749
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3d0dc749

Branch: refs/heads/develop
Commit: 3d0dc749259185c266a67db85fb8ef65a4340819
Parents: dbdf6fe
Author: Hitesh Khamesra <hkhame...@pivotal.io>
Authored: Mon Sep 19 10:36:31 2016 -0700
Committer: Hitesh Khamesra <hkhame...@pivotal.io>
Committed: Mon Sep 19 10:38:11 2016 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/geode/internal/tcp/TCPConduit.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3d0dc749/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
----------------------------------------------------------------------
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java 
b/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
index 1eb7626..08f4e10 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/TCPConduit.java
@@ -261,6 +261,9 @@ public class TCPConduit implements Runnable {
     } catch (IOException io) {
       throw new 
ConnectionException(LocalizedStrings.TCPConduit_UNABLE_TO_INITIALIZE_CONNECTION_TABLE.toLocalizedString(),
 io);
     }
+    
+    this.socketCreator = 
SocketCreatorFactory.getSocketCreatorForComponent(SecurableCommunicationChannel.CLUSTER);
+    
     this.useNIO = USE_NIO;
     if (this.useNIO) {
       InetAddress addr = address;
@@ -280,9 +283,7 @@ public class TCPConduit implements Runnable {
           }
         }
       }
-    }
-
-    this.socketCreator = 
SocketCreatorFactory.getSocketCreatorForComponent(SecurableCommunicationChannel.CLUSTER);
+    }    
 
     startAcceptor();
   }

Reply via email to