Merge pull request #418 from folio-org/MODFQMMGR-462-no-mo-mod-consorsio

MODFQMMGR-462 Fix NPE
folio-org · Sep 11, 2024 · 66f13ce · 66f13ce
2 parents b9d5768 + ada5817
commit 66f13ce
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/main/java/org/folio/fqm/service/CrossTenantQueryService.java b/src/main/java/org/folio/fqm/service/CrossTenantQueryService.java
@@ -37,7 +37,7 @@ public List<String> getTenantsToQuery(EntityType entityType, boolean forceCrossT
       // The Instances entity type is required to retrieve shared instances from the central tenant when
       // running queries from member tenants. This means that if we are running a query for Instances, we need to
       // query the current tenant (for local records) as well as the central tenant (for shared records).
-      if (COMPOSITE_INSTANCES_ID.equals(entityType.getId())) {
+      if (centralTenantId != null && COMPOSITE_INSTANCES_ID.equals(entityType.getId())) {
         return List.of(executionContext.getTenantId(), centralTenantId);
       }
       return List.of(executionContext.getTenantId());