Merge "NPE when deleting draft patch set when previous draft already …

…deleted" into stable-2.6
ckamm · Sep 18, 2013 · 640b95c · 640b95c
2 parents 5ff6ebe + 357b5be
commit 640b95c
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java b/gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java
@@ -112,9 +112,7 @@ public ReviewResult call() throws NoSuchChangeException, OrmException {
       }
       if (change.currentPatchSetId().equals(patchSetId)) {
         try {
-          PatchSet.Id id =
-              new PatchSet.Id(patchSetId.getParentKey(), patchSetId.get() - 1);
-          change.setCurrentPatchSet(patchSetInfoFactory.get(db, id));
+          change.setCurrentPatchSet(patchSetInfoFactory.get(db, highestId));
         } catch (PatchSetInfoNotAvailableException e) {
           throw new NoSuchChangeException(changeId);
         }