Temp commit

IHTSDO · Mar 21, 2023 · a8b47aa · a8b47aa
1 parent eb35ce9
commit a8b47aa
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/main/java/org/snomed/snowstorm/core/data/services/BranchMergeService.java b/src/main/java/org/snomed/snowstorm/core/data/services/BranchMergeService.java
@@ -150,14 +150,18 @@ public BranchMergeJob mergeBranchAsync(MergeRequest mergeRequest) {
 			} catch (IntegrityException e) {
 				mergeJob.setStatus(JobStatus.CONFLICTS);
 				mergeJob.setMessage(e.getMessage());
+//				try {
+//					ObjectMapper mapper = new ObjectMapper();
+//					String apiError = mapper.writeValueAsString(ApiErrorFactory.createErrorForMergeConflicts(e.getMessage(), e.getIntegrityIssueReport()));
+//					mergeJob.setApiError(apiError);
+//				} catch (JsonProcessingException ex) {
+//					throw new RuntimeException(ex);
+//				}
 				try {
-					ObjectMapper mapper = new ObjectMapper();
-					String apiError = mapper.writeValueAsString(ApiErrorFactory.createErrorForMergeConflicts(e.getMessage(), e.getIntegrityIssueReport()));
-					mergeJob.setApiError(apiError);
-				} catch (JsonProcessingException ex) {
-					throw new RuntimeException(ex);
+					branchMergeJobRepository.save(mergeJob);
+				} catch (Exception ex) {
+					logger.error("Failed to save merge job", ex);
 				}
-				branchMergeJobRepository.save(mergeJob);
 			} catch (Exception e) {
 				mergeJob.setStatus(JobStatus.FAILED);
 				mergeJob.setMessage(e.getMessage());