fix: add check to avoid to try locking not existing ridbags

orientechnologies · Sep 19, 2023 · ca4067a · ca4067a
1 parent 7354684
commit ca4067a
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/.../java/com/orientechnologies/orient/core/storage/impl/local/OAbstractPaginatedStorage.java b/.../java/com/orientechnologies/orient/core/storage/impl/local/OAbstractPaginatedStorage.java
@@ -6339,15 +6339,17 @@ private void lockRidBags(
     for (final Map.Entry<String, OTransactionIndexChanges> entry : indexes.entrySet()) {
       final String indexName = entry.getKey();
       final OIndexInternal index = entry.getValue().resolveAssociatedIndex(indexName, manager, db);
-      try {
-        OBaseIndexEngine engine = getIndexEngine(index.getIndexId());
+      if (index != null) {
+        try {
+          OBaseIndexEngine engine = getIndexEngine(index.getIndexId());
 
-        if (!index.isUnique() && engine.hasRidBagTreesSupport()) {
-          atomicOperationsManager.acquireExclusiveLockTillOperationComplete(
-              atomicOperation, OIndexRIDContainerSBTree.generateLockName(indexName));
+          if (!index.isUnique() && engine.hasRidBagTreesSupport()) {
+            atomicOperationsManager.acquireExclusiveLockTillOperationComplete(
+                atomicOperation, OIndexRIDContainerSBTree.generateLockName(indexName));
+          }
+        } catch (OInvalidIndexEngineIdException e) {
+          throw logAndPrepareForRethrow(e, false);
         }
-      } catch (OInvalidIndexEngineIdException e) {
-        throw logAndPrepareForRethrow(e, false);
       }
     }
   }