opendev/gerrit
Code Issues Proposed changes

Merge "MergeOp: Log IntegrationExceptions that are treated as conflict only as warning"

Browse Source
This commit is contained in:
David Pursehouse
2019-10-18 13:13:14 +00:00
committed by Gerrit Code Review
parent 4b91f7a8a2 5712849926
commit a6a24933d4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/com/google/gerrit/server/submit/MergeOp.java
View File

@@ -504,7 +504,7 @@ public class MergeOp implements AutoCloseable {
try { try {
integrateIntoHistory(cs); integrateIntoHistory(cs);
} catch (IntegrationException e) { } catch (IntegrationException e) {
logger.atSevere().withCause(e).log("Error from integrateIntoHistory"); logger.atWarning().withCause(e).log("Error from integrateIntoHistory");
throw new ResourceConflictException(e.getMessage(), e); throw new ResourceConflictException(e.getMessage(), e);
} }
return null; return null;