You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by jx...@apache.org on 2018/03/25 21:44:55 UTC
[4/6] helix git commit: Fixed broken TestZkHelixAdmin()
Fixed broken TestZkHelixAdmin()
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/0e632b77
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/0e632b77
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/0e632b77
Branch: refs/heads/master
Commit: 0e632b7797a03ce3b63feee394ff43567a73d014
Parents: 284c66d
Author: hrzhang <hr...@linkedin.com>
Authored: Thu Mar 8 14:33:47 2018 -0800
Committer: dasahcc <ju...@gmail.com>
Committed: Sun Mar 25 14:43:42 2018 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/helix/model/InstanceConfig.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/0e632b77/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java
----------------------------------------------------------------------
diff --git a/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java b/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java
index a26c039..3cc3c58 100644
--- a/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java
+++ b/helix-core/src/main/java/org/apache/helix/model/InstanceConfig.java
@@ -330,7 +330,7 @@ public class InstanceConfig extends HelixProperty {
disabledPartitions.addAll(oldDisabled);
}
- if (newDisabledMap != null) {
+ if (newDisabledMap != null && newDisabledMap.containsKey(resourceName)) {
disabledPartitions.addAll(HelixUtil.deserializeByComma(newDisabledMap.get(resourceName)));
}
return new ArrayList<String>(disabledPartitions);