From d35daf66bf580d4fb1d39fe840a9635a4b38bc93 Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Thu, 8 Mar 2018 13:19:19 +0100 Subject: Unify style --- .../yahoo/vespa/clustercontroller/core/ClusterInfo.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'clustercontroller-core/src') diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java index ff92fc6867f..b80004b02e7 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java @@ -78,15 +78,17 @@ public class ClusterInfo { // Update node set nodes.clear(); - for (ConfiguredNode node : newNodes) + for (ConfiguredNode node : newNodes) { this.nodes.put(node.index(), node); + } } private void addNodeInfo(NodeInfo nodeInfo) { - if (nodeInfo instanceof DistributorNodeInfo) - distributorNodeInfo.put(nodeInfo.getNodeIndex(), (DistributorNodeInfo)nodeInfo); - else - storageNodeInfo.put(nodeInfo.getNodeIndex(), (StorageNodeInfo)nodeInfo); + if (nodeInfo instanceof DistributorNodeInfo) { + distributorNodeInfo.put(nodeInfo.getNodeIndex(), (DistributorNodeInfo) nodeInfo); + } else { + storageNodeInfo.put(nodeInfo.getNodeIndex(), (StorageNodeInfo) nodeInfo); + } allNodeInfo.put(nodeInfo.getNode(), nodeInfo); nodeInfo.setReportedState(nodeInfo.getReportedState().setDescription("Node not seen in slobrok."), 0); } @@ -108,8 +110,9 @@ public class ClusterInfo { */ public NodeInfo setRpcAddress(Node node, String rpcAddress) { NodeInfo nodeInfo = getInfo(node); - if (nodeInfo != null) + if (nodeInfo != null) { nodeInfo.setRpcAddress(rpcAddress); + } return nodeInfo; } // TODO: Do all mutation of node info through setters in this -- cgit v1.2.3