Repository: hadoop Updated Branches: refs/heads/trunk 71e0b0d80 -> 542665381
HDDS-908: NPE in TestOzoneRpcClient. Contributed by Ajay Kumar. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/54266538 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/54266538 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/54266538 Branch: refs/heads/trunk Commit: 54266538192a558c6d80725c25912005090e14c4 Parents: 71e0b0d Author: Anu Engineer <[email protected]> Authored: Mon Dec 17 12:17:09 2018 -0800 Committer: Anu Engineer <[email protected]> Committed: Mon Dec 17 12:18:47 2018 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/ozone/om/OzoneManager.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/54266538/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java ---------------------------------------------------------------------- diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java index a044bc2..f41eb88 100644 --- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java +++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java @@ -1438,11 +1438,14 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl .setNodeType(HddsProtos.NodeType.DATANODE) .setHostname(datanode.getHostName()); - dnServiceInfoBuilder.addServicePort(ServicePort.newBuilder() - .setType(ServicePort.Type.HTTP) - .setValue(DatanodeDetails.getFromProtoBuf(datanode) - .getPort(DatanodeDetails.Port.Name.REST).getValue()) - .build()); + if(DatanodeDetails.getFromProtoBuf(datanode) + .getPort(DatanodeDetails.Port.Name.REST) != null) { + dnServiceInfoBuilder.addServicePort(ServicePort.newBuilder() + .setType(ServicePort.Type.HTTP) + .setValue(DatanodeDetails.getFromProtoBuf(datanode) + .getPort(DatanodeDetails.Port.Name.REST).getValue()) + .build()); + } services.add(dnServiceInfoBuilder.build()); } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
