[helix] branch master updated: Fix partitionAssignment NPE when no resource configs (#2653)

[xyuanlu]

This is an automated email from the ASF dual-hosted git repository.

xyuanlu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/master by this push:
     new 65e657dec Fix partitionAssignment NPE when no resource configs (#2653)
65e657dec is described below

commit 65e657decc79ce0061a5cfcbaf145e83a4053d85
Author: Grant Paláu Spencer <gspen...@linkedin.com>
AuthorDate: Wed Oct 18 11:23:19 2023 -0700

    Fix partitionAssignment NPE when no resource configs (#2653)
---
 .../server/resources/helix/ResourceAssignmentOptimizerAccessor.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/ResourceAssignmentOptimizerAccessor.java
 
b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/ResourceAssignmentOptimizerAccessor.java
index 80386e008..346c026dd 100644
--- 
a/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/ResourceAssignmentOptimizerAccessor.java
+++ 
b/helix-rest/src/main/java/org/apache/helix/rest/server/resources/helix/ResourceAssignmentOptimizerAccessor.java
@@ -359,8 +359,10 @@ public class ResourceAssignmentOptimizerAccessor extends 
AbstractHelixResource {
     ConfigAccessor cfgAccessor = getConfigAccessor();
     List<ResourceConfig> wagedResourceConfigs = new ArrayList<>();
     for (IdealState idealState : wagedResourceIdealState) {
-      wagedResourceConfigs
-          .add(cfgAccessor.getResourceConfig(clusterId, 
idealState.getResourceName()));
+      ResourceConfig resourceConfig = cfgAccessor.getResourceConfig(clusterId, 
idealState.getResourceName());
+      if (resourceConfig != null) {
+        wagedResourceConfigs.add(resourceConfig);
+      }
     }
 
     Map<String, ResourceAssignment> wagedAssignmentResult;