aboutsummaryrefslogtreecommitdiffstats
path: root/clustercontroller-core
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@oath.com>2018-03-08 13:19:19 +0100
committerTor Brede Vekterli <vekterli@oath.com>2018-03-08 13:19:43 +0100
commitd35daf66bf580d4fb1d39fe840a9635a4b38bc93 (patch)
tree86dbe7c57339782026741282cf1ea55eb9aa3ddf /clustercontroller-core
parent0620c1d40d439121cad2a7cb73e8be21d0eacdf1 (diff)
Unify style
Diffstat (limited to 'clustercontroller-core')
-rw-r--r--clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/ClusterInfo.java15
1 files changed, 9 insertions, 6 deletions
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