Fix typo
Project: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/commit/1cf9099e Tree: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/tree/1cf9099e Diff: http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/diff/1cf9099e Branch: refs/heads/tls Commit: 1cf9099e975860eb11408b1c69f3589c6b78abf7 Parents: 66b5c72 Author: Li Zhanhui <[email protected]> Authored: Wed Jun 14 12:59:41 2017 +0800 Committer: Li Zhanhui <[email protected]> Committed: Wed Jun 14 12:59:41 2017 +0800 ---------------------------------------------------------------------- .../java/org/apache/rocketmq/remoting/netty/SslHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rocketmq/blob/1cf9099e/remoting/src/main/java/org/apache/rocketmq/remoting/netty/SslHelper.java ---------------------------------------------------------------------- diff --git a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/SslHelper.java b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/SslHelper.java index 95bcdc4..bdf10bf 100644 --- a/remoting/src/main/java/org/apache/rocketmq/remoting/netty/SslHelper.java +++ b/remoting/src/main/java/org/apache/rocketmq/remoting/netty/SslHelper.java @@ -71,10 +71,10 @@ public class SslHelper { } else { return SslContextBuilder.forClient() .sslProvider(provider) - .trustManager(new File(properties.getProperty("trustManager"))) + .trustManager(new File(properties.getProperty("client.trustManager"))) .keyManager( properties.containsKey("client.keyCertChainFile") ? new File(properties.getProperty("client.keyCertChainFile")) : null, - properties.containsKey("client.keyFile") ? new File(properties.getProperty("client.key")) : null, + properties.containsKey("client.keyFile") ? new File(properties.getProperty("client.keyFile")) : null, properties.containsKey("client.password") ? properties.getProperty("client.password") : null) .build(); } @@ -90,7 +90,7 @@ public class SslHelper { } else { return SslContextBuilder.forServer( properties.containsKey("server.keyCertChainFile") ? new File(properties.getProperty("server.keyCertChainFile")) : null, - properties.containsKey("server.keyFile") ? new File(properties.getProperty("server.key")) : null, + properties.containsKey("server.keyFile") ? new File(properties.getProperty("server.keyFile")) : null, properties.containsKey("server.password") ? properties.getProperty("server.password") : null) .sslProvider(provider) .trustManager(new File(properties.getProperty("server.trustManager")))
