diff options
| author | Martin Polden <mpolden@mpolden.no> | 2019-09-16 14:20:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-16 14:20:06 +0200 |
| commit | 5a6475f649fe953b4bc8c15c21d956a3805df431 (patch) | |
| tree | be10b9dfc5b5267689eca965fb8a7b033e48dce9 /node-repository | |
| parent | a9e79477a3bc051400c277d1ae5e4ca02ee44f07 (diff) | |
Make exception symmetric
Co-Authored-By: Valerij Fredriksen <freva@users.noreply.github.com>
Diffstat (limited to 'node-repository')
| -rw-r--r-- | node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java index bbac3241988..b13728cb148 100644 --- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java +++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/node/IP.java @@ -148,7 +148,8 @@ public class IP { /** Returns whether IP address of existing node can be assigned to node */ private static boolean canAssignIpOf(Node existingNode, Node node) { - if (node.parentHostname().isEmpty()) return false; // Not a child node + if (node.parentHostname().isPresent() == existingNode.parentHostname().isPresent()) return false; // Not a parent-child node + if (node.parentHostname().isEmpty()) return canAssignIpOf(node, existingNode); if (!node.parentHostname().get().equals(existingNode.hostname())) return false; // Wrong host switch (node.type()) { case proxy: return existingNode.type() == proxyhost; |