opendev/gerrit
Code Issues Proposed changes

Fix error message in MergeOp

Browse Source 
Do not include error message from UpdateException.

Change-Id: I54193ae0c7f86d1b87db000c2902663729daeb4c
This commit is contained in:
Zhen Chen
2016-10-12 12:47:27 -07:00
committed by David Pursehouse
parent 0dcdaf17e6
commit ce5a06e891
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/git/MergeOp.java
View File

@@ -470,7 +470,9 @@ public class MergeOp implements AutoCloseable {
BatchUpdate.execute(orm.batchUpdates(allProjects), BatchUpdate.execute(orm.batchUpdates(allProjects),
new SubmitStrategyListener(submitInput, strategies, commits), new SubmitStrategyListener(submitInput, strategies, commits),
submissionId); submissionId);
} catch (UpdateException | SubmoduleException e) { } catch (SubmoduleException e) {
throw new IntegrationException(e);
} catch (UpdateException e) {
// BatchUpdate may have inadvertently wrapped an IntegrationException // BatchUpdate may have inadvertently wrapped an IntegrationException
// thrown by some legacy SubmitStrategyOp code that intended the error // thrown by some legacy SubmitStrategyOp code that intended the error
// message to be user-visible. Copy the message from the wrapped // message to be user-visible. Copy the message from the wrapped
@@ -482,8 +484,7 @@ public class MergeOp implements AutoCloseable {
if (e.getCause() instanceof IntegrationException) { if (e.getCause() instanceof IntegrationException) {
msg = e.getCause().getMessage(); msg = e.getCause().getMessage();
} else { } else {
msg = "Error submitting change" + (cs.size() != 1 ? "s" : "") + ": \n" msg = "Error submitting change" + (cs.size() != 1 ? "s" : "");
+ e.getMessage();
} }
throw new IntegrationException(msg, e); throw new IntegrationException(msg, e);
} }