Repository: storm Updated Branches: refs/heads/master 0f89cd8ab -> 4605ae0a3
STORM-3223: Fix NPE on blacklisted rack Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/6d58e63e Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d58e63e Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d58e63e Branch: refs/heads/master Commit: 6d58e63eb085ef21adf9170fbc3e9eb93db0c621 Parents: f3c1437 Author: Robert (Bobby) Evans <[email protected]> Authored: Thu Sep 13 13:35:47 2018 -0500 Committer: Robert (Bobby) Evans <[email protected]> Committed: Thu Sep 13 13:35:47 2018 -0500 ---------------------------------------------------------------------- .../resource/strategies/scheduling/BaseResourceAwareStrategy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/6d58e63e/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java ---------------------------------------------------------------------- diff --git a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java index 1132432..59b0f31 100644 --- a/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java +++ b/storm-server/src/main/java/org/apache/storm/scheduler/resource/strategies/scheduling/BaseResourceAwareStrategy.java @@ -332,7 +332,7 @@ public abstract class BaseResourceAwareStrategy implements IStrategy { private TreeSet<ObjectResources> getSortedNodesFor(String rackId) { return cachedNodes.computeIfAbsent(rackId, - (rid) -> sortNodes(rackIdToNodes.get(rid), exec, td, rid, perNodeScheduledCount)); + (rid) -> sortNodes(rackIdToNodes.getOrDefault(rid, Collections.emptyList()), exec, td, rid, perNodeScheduledCount)); } @Override
