commit | d78e4137b5122874fefdb3558d8d645b16dba4d1 | [log] [tgz] |
---|---|---|
author | David Pursehouse <dpursehouse@collab.net> | Fri Nov 16 11:57:05 2018 -0800 |
committer | David Pursehouse <dpursehouse@collab.net> | Fri Nov 16 11:57:08 2018 -0800 |
tree | 2aa59b73a11c3b8a72ae4a9a829780a46f06fc82 | |
parent | 0c069aa15869d1d98964058d0e1d12baa4bc8455 [diff] |
MergeChangeCommand: Remove unreachable 'throw new IOException()' The isMergedInto method returns a boolean, which can never be null. Change-Id: Ie8271bb1a511f35e305196340b0bed1733fdb160
diff --git a/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/MergeChangeCommand.java b/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/MergeChangeCommand.java index 932b000..a18b35b 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/MergeChangeCommand.java +++ b/src/main/java/com/googlesource/gerrit/plugins/batch/ssh/MergeChangeCommand.java
@@ -137,11 +137,7 @@ } for (ObjectId parent : parents) { Project.NameKey project = psarg.change.getDest().getParentKey(); - Boolean isMergedInto = isMergedInto(project, parent, sha1); - if (isMergedInto == null) { - throw new IOException(); - } - if (isMergedInto) { + if (isMergedInto(project, parent, sha1)) { return true; } }