Merge branch 'janusoptimisation' into dev/janusoptimisation

atlanhq · Nov 21, 2024 · a57c81b · a57c81b
2 parents afe1a35 + 7feef65
commit a57c81b
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java b/repository/src/main/java/org/apache/atlas/discovery/EntityDiscoveryService.java
@@ -1230,8 +1230,9 @@ private void prepareSearchResult(AtlasSearchResult ret, DirectIndexQueryResult i
         if (AtlasConfiguration.ENABLE_JANUS_GRAPH_OPTIMISATION.getBoolean()) {
             LOG.debug("enabled janusGraphOptimisation");
             prepareSearchResultAsync(ret, indexQueryResult, resultAttributes, fetchCollapsedResults);
+        }else {
+            prepareSearchResultSync(ret, indexQueryResult, resultAttributes, fetchCollapsedResults);
         }
-        prepareSearchResultSync(ret, indexQueryResult, resultAttributes, fetchCollapsedResults);
     }
     // Non-recursive collapse processing
     private Map<String, AtlasSearchResult> processCollapseResults(Result result, SearchParams searchParams, Set<String> resultAttributes) throws AtlasBaseException {