opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.13'

Browse Source 
* stable-2.13:
  Fix NPE when requesting invalid Change-Id to index

Change-Id: Id909cd3585a5631bb0ae7947e6e4cb94117fc3a9
This commit is contained in:
David Pursehouse
2016-11-17 11:42:02 -08:00
committed by Edwin Kempin
parent d7424d36b0 b541126401
commit ede1ff4004
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gerrit-sshd/src/main/java/com/google/gerrit/sshd/ChangeArgumentParser.java
View File

@@ -96,8 +96,8 @@ public class ChangeArgumentParser {
} }
private List<ChangeControl> changeFromNotesFactory(String id, CurrentUser currentUser) private List<ChangeControl> changeFromNotesFactory(String id, CurrentUser currentUser)
throws OrmException { throws OrmException, UnloggedFailure {
return changeNotesFactory.create(db, Arrays.asList(Change.Id.parse(id))) return changeNotesFactory.create(db, parseId(id))
.stream() .stream()
.map(changeNote -> controlForChange(changeNote, currentUser)) .map(changeNote -> controlForChange(changeNote, currentUser))
.filter(changeControl -> changeControl.isPresent()) .filter(changeControl -> changeControl.isPresent())
@@ -105,7 +105,16 @@ public class ChangeArgumentParser {
.collect(toList()); .collect(toList());
} }
private Optional<ChangeControl> controlForChange(ChangeNotes change, CurrentUser user) { private List<Change.Id> parseId(String id) throws UnloggedFailure {
try {
return Arrays.asList(new Change.Id(Integer.parseInt(id)));
} catch (NumberFormatException e) {
throw new UnloggedFailure(2, "Invalid change ID " + id, e);
}
}
private Optional<ChangeControl> controlForChange(ChangeNotes change,
CurrentUser user) {
try { try {
return Optional.of(changeControlFactory.controlFor(change, user)); return Optional.of(changeControlFactory.controlFor(change, user));
} catch (NoSuchChangeException e) { } catch (NoSuchChangeException e) {