Merge branch 'develop' into feature/GEODE-420 # Conflicts: # geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java # geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/d4cca873 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/d4cca873 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/d4cca873 Branch: refs/heads/feature/GEODE-420 Commit: d4cca8737b4dafb727f90be28ad0fb8e097172bf Parents: c6f5997 a4c38a4 Author: Udo Kohlmeyer <[email protected]> Authored: Wed Sep 7 02:19:15 2016 +1000 Committer: Udo Kohlmeyer <[email protected]> Committed: Wed Sep 7 02:19:15 2016 +1000 ---------------------------------------------------------------------- .../internal/JmxManagerLocatorRequest.java | 8 +- .../internal/cli/commands/ShellCommands.java | 13 +- .../ConnectToLocatorSSLDUnitTest.java | 136 +++++++++++++++++++ 3 files changed, 150 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d4cca873/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java ---------------------------------------------------------------------- diff --cc geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java index 495f64d,ac250d0..39f914f --- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java +++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java @@@ -88,8 -85,11 +85,13 @@@ public class JmxManagerLocatorRequest i distributionConfigProps.putAll(sslConfigProps); } + // re-initialize the SocketCreator with the sslConfigProps. Note this initializes the SocketCreator with cluster-ssl-* settings since + // we are connecting to the locator only. - SocketCreator.getDefaultInstance(distributionConfigProps); ++ //TODO Udo: Look into this ++ // SocketCreator.getDefaultInstance(distributionConfigProps); + - Object responseFromServer = TcpClient.requestToServer(networkAddress, locatorPort, SINGLETON, msTimeout); + TcpClient client = new TcpClient(); + Object responseFromServer = client.requestToServer(networkAddress, locatorPort, SINGLETON, msTimeout); return (JmxManagerLocatorResponse) responseFromServer; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d4cca873/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java ----------------------------------------------------------------------
