You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by xy...@apache.org on 2018/11/22 01:17:53 UTC
[50/50] [abbrv] hadoop git commit: Fix HDDS-4 after HDDS-751.
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/b89edbcb
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b89edbcb
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b89edbcb
Branch: refs/heads/HDDS-4
Commit: b89edbcb89e14d742324bc15f5b9c7acbb7cfc78
Parents: 594070b
Author: Xiaoyu Yao <xy...@apache.org>
Authored: Wed Nov 21 08:38:30 2018 -0800
Committer: Xiaoyu Yao <xy...@apache.org>
Committed: Wed Nov 21 13:19:39 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/b89edbcb/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-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org