opendev/gerrit
Code Issues Proposed changes

Rebase: Use Ints.tryParse instead of catching exception

Browse Source 
Change-Id: I4e6584df22c354cad578d7223cb34e0e3c519768
This commit is contained in:
Dave Borowitz
2015-05-20 18:57:36 -07:00
parent 4ab21befbc
commit 437c8a1179
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gerrit-server/src/main/java/com/google/gerrit/server/change/Rebase.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.change;
import com.google.common.primitives.Ints;
import com.google.gerrit.common.errors.EmailException;
import com.google.gerrit.extensions.api.changes.RebaseInput;
import com.google.gerrit.extensions.client.ListChangesOption;
@@ -161,29 +162,26 @@ public class Rebase implements RestModifyView<RevisionResource, RebaseInput>,
// Try parsing base as a change number (assume current patch set).
PatchSet basePatchSet = null;
try {
Change.Id baseChangeId = Change.Id.parse(base);
if (baseChangeId != null) {
for (PatchSet ps : db.patchSets().byChange(baseChangeId)) {
if (basePatchSet == null
|| basePatchSet.getId().get() < ps.getId().get()) {
basePatchSet = ps;
}
}
}
} catch (NumberFormatException e) { // Probably a SHA-1.
}
// Try parsing as SHA-1.
if (basePatchSet == null) {
for (PatchSet ps : db.patchSets().byRevision(new RevId(base))) {
Integer baseChangeId = Ints.tryParse(base);
if (baseChangeId != null) {
for (PatchSet ps : db.patchSets().byChange(new Change.Id(baseChangeId))) {
if (basePatchSet == null
|| basePatchSet.getId().get() < ps.getId().get()) {
basePatchSet = ps;
}
}
if (basePatchSet != null) {
return basePatchSet;
}
}
// Try parsing as SHA-1.
for (PatchSet ps : db.patchSets().byRevision(new RevId(base))) {
if (basePatchSet == null
|| basePatchSet.getId().get() < ps.getId().get()) {
basePatchSet = ps;
}
}
return basePatchSet;
}