native repo: operationResult.computeStatusIfUnknown() -> close()

Evolveum · Jun 27, 2022 · ef9558f · ef9558f
1 parent 7bb62e6
commit ef9558f
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 26 deletions.
diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/SqaleRepositoryService.java
@@ -163,7 +163,7 @@ public SqaleRepositoryService(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
             OperationLogger.logGetObject(type, oid, options, object, operationResult);
         }
     }
@@ -248,7 +248,7 @@ public <T extends ObjectType> String getVersion(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -332,7 +332,7 @@ public <T extends ObjectType> String addObject(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
             OperationLogger.logAdd(object, options, operationResult);
         }
     }
@@ -457,7 +457,7 @@ public <T extends ObjectType> ModifyObjectResult<T> modifyObject(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
             OperationLogger.logModify(type, oid, modifications, precondition, options, operationResult);
         }
     }
@@ -522,7 +522,7 @@ private <T extends ObjectType> ModifyObjectResult<T> executeModifyObject(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
             OperationLogger.logModifyDynamically(type, oid, rv, modifyOptions, operationResult);
         }
     }
@@ -770,7 +770,7 @@ private void logTraceModifications(@NotNull Collection<? extends ItemDelta<?, ?>
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -843,7 +843,7 @@ public <T extends ObjectType> int countObjects(Class<T> type, ObjectQuery query,
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -894,7 +894,7 @@ private <T extends ObjectType> int executeCountObjects(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -949,7 +949,7 @@ public <T extends ObjectType> SearchResultMetadata searchObjectsIterative(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1197,7 +1197,7 @@ public <T extends Containerable> int countContainers(Class<T> type, ObjectQuery
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1247,7 +1247,7 @@ public <T extends Containerable> SearchResultList<T> searchContainers(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1360,7 +1360,7 @@ public <F extends FocusType> PrismObject<F> searchShadowOwner(String shadowOid,
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1384,7 +1384,7 @@ public long advanceSequence(String oid, OperationResult parentResult)
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1475,7 +1475,7 @@ public void returnUnusedValuesToSequence(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1620,7 +1620,7 @@ public void repositorySelfTest(OperationResult parentResult) {
         } catch (Exception e) {
             recordFatalError(operationResult, e);
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1679,7 +1679,7 @@ public void testOrgClosureConsistency(boolean repairIfNecessary, OperationResult
         } catch (Exception e) {
             recordFatalError(operationResult, e);
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1713,7 +1713,7 @@ public RepositoryQueryDiagResponse executeQueryDiagnostics(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1942,7 +1942,7 @@ public boolean hasConflict(ConflictWatcher watcher, OperationResult parentResult
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -1974,7 +1974,7 @@ public <T extends ObjectType> void addDiagnosticInformation(Class<T> type, Strin
             operationResult.recordFatalError("Couldn't add diagnostic information: " + t.getMessage(), t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 

diff --git a/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/SqaleAuditService.java b/repo/repo-sqale/src/main/java/com/evolveum/midpoint/repo/sqale/audit/SqaleAuditService.java
@@ -95,7 +95,7 @@ public void audit(AuditEventRecord record, Task task, OperationResult parentResu
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -363,7 +363,7 @@ public void audit(AuditEventRecordType record, OperationResult parentResult) {
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -406,7 +406,7 @@ private void cleanupAuditMaxAge(CleanupPolicyType policy, OperationResult parent
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -456,7 +456,7 @@ private void cleanupAuditMaxRecords(CleanupPolicyType policy, OperationResult pa
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -518,7 +518,7 @@ public int countObjects(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -561,7 +561,7 @@ public SearchResultList<AuditEventRecordType> searchObjects(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }
 
@@ -610,7 +610,7 @@ public SearchResultMetadata searchObjectsIterative(
             recordFatalError(operationResult, t);
             throw t;
         } finally {
-            operationResult.computeStatusIfUnknown();
+            operationResult.close();
         }
     }