Repository: helix Updated Branches: refs/heads/master abfb894e5 -> f4bb7d607
[HELIX-740] check NPE in getInstancesInClusterWithTag and throw more meaningful exception Project: http://git-wip-us.apache.org/repos/asf/helix/repo Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/f4bb7d60 Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/f4bb7d60 Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/f4bb7d60 Branch: refs/heads/master Commit: f4bb7d60782150c7d713c907211cc9d41f002c48 Parents: abfb894 Author: Harry Zhang <[email protected]> Authored: Tue Jul 17 15:50:02 2018 -0700 Committer: Harry Zhang <[email protected]> Committed: Tue Jul 17 15:50:02 2018 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/helix/blob/f4bb7d60/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java ---------------------------------------------------------------------- diff --git a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java index 3d708e5..59336fd 100644 --- a/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java +++ b/helix-core/src/main/java/org/apache/helix/manager/zk/ZKHelixAdmin.java @@ -36,7 +36,6 @@ import java.util.Set; import java.util.TreeMap; import java.util.UUID; import java.util.concurrent.TimeUnit; - import org.I0Itec.zkclient.DataUpdater; import org.I0Itec.zkclient.exception.ZkNoNodeException; import org.apache.helix.AccessOption; @@ -666,6 +665,11 @@ public class ZKHelixAdmin implements HelixAdmin { for (String instanceName : instances) { InstanceConfig config = accessor.getProperty(keyBuilder.instanceConfig(instanceName)); + if (config == null) { + throw new IllegalStateException(String + .format("Instance %s does not have a config, cluster might be in bad state", + instanceName)); + } if (config.containsTag(tag)) { result.add(instanceName); }
