(pinot) branch master updated: [hotfix] avoid npe when checking mirror server set assignment (#11915)

[rongr]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 8d49b112c2 [hotfix] avoid npe when checking mirror server set 
assignment (#11915)
8d49b112c2 is described below

commit 8d49b112c203e6e6f46ee9f4142cfd1616fc6470
Author: Rong Rong <ro...@apache.org>
AuthorDate: Tue Oct 31 14:49:23 2023 -0700

    [hotfix] avoid npe when checking mirror server set assignment (#11915)
    
    Co-authored-by: Rong Rong <ro...@startree.ai>
---
 .../apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java
 
b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java
index 30a3a19f20..ebf38d308f 100644
--- 
a/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java
+++ 
b/pinot-common/src/main/java/org/apache/pinot/common/assignment/InstanceAssignmentConfigUtils.java
@@ -129,7 +129,8 @@ public class InstanceAssignmentConfigUtils {
       InstancePartitionsType instancePartitionsType) {
     // If the instance assignment config is not null and the partition 
selector is
     // MIRROR_SERVER_SET_PARTITION_SELECTOR,
-    return 
tableConfig.getInstanceAssignmentConfigMap().get(instancePartitionsType.toString())
 != null
+    return tableConfig.getInstanceAssignmentConfigMap() != null
+        && 
tableConfig.getInstanceAssignmentConfigMap().get(instancePartitionsType.toString())
 != null
         && 
InstanceAssignmentConfigUtils.getInstanceAssignmentConfig(tableConfig, 
instancePartitionsType)
         .getPartitionSelector()
         == 
InstanceAssignmentConfig.PartitionSelector.MIRROR_SERVER_SET_PARTITION_SELECTOR;


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org