Fix HDDS-4 after HDDS-751.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3bee23d2 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3bee23d2 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3bee23d2 Branch: refs/heads/HDDS-4 Commit: 3bee23d24f6d90592e715be35fa6213a2723e0a6 Parents: 18c9db9 Author: Xiaoyu Yao <x...@apache.org> Authored: Wed Nov 21 08:38:30 2018 -0800 Committer: Xiaoyu Yao <x...@apache.org> Committed: Thu Nov 29 11:57:48 2018 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3bee23d2/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java index e355d0a..1bb9972 100644 --- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java +++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/hdds/scm/HddsServerUtil.java @@ -176,9 +176,11 @@ public final class HddsServerUtil { ScmConfigKeys.OZONE_SCM_SECURITY_SERVICE_ADDRESS_KEY); return NetUtils.createSocketAddr( - host.or(ScmConfigKeys.OZONE_SCM_SECURITY_SERVICE_BIND_HOST_DEFAULT) + + host.orElse(ScmConfigKeys + .OZONE_SCM_SECURITY_SERVICE_BIND_HOST_DEFAULT) + ":" + port - .or(conf.getInt(ScmConfigKeys.OZONE_SCM_SECURITY_SERVICE_PORT_KEY, + .orElse(conf.getInt(ScmConfigKeys + .OZONE_SCM_SECURITY_SERVICE_PORT_KEY, ScmConfigKeys.OZONE_SCM_SECURITY_SERVICE_PORT_DEFAULT))); } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
