keep lines as they were

Signed-off-by: Mikhail Khludnev <mkhl@apache.org>
opensearch-project · Feb 3, 2024 · bb39519 · bb39519
1 parent 4e49f1c
commit bb39519
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/server/src/main/java/org/opensearch/index/query/NestedQueryBuilder.java b/server/src/main/java/org/opensearch/index/query/NestedQueryBuilder.java
@@ -319,13 +319,16 @@ protected Query doToQuery(QueryShardContext context) throws IOException {
         }
 
         BitSetProducer previousParentFilter = context.getParentFilter();
-        context.nestedScope().nextLevel(nestedObjectMapper);
         try {
             context.setParentFilter(parentFilter);
-            innerQuery = this.query.toQuery(context);
+            context.nestedScope().nextLevel(nestedObjectMapper);
+            try {
+                innerQuery = this.query.toQuery(context);
+            } finally {
+                context.nestedScope().previousLevel();
+            }
         } finally {
             context.setParentFilter(previousParentFilter);
-            context.nestedScope().previousLevel();
         }
 
         // ToParentBlockJoinQuery requires that the inner query only matches documents