commit 640b95cf1b26795e2cb6013499f0d59be4dc0767
author Edwin Kempin <edwin.kempin@gmail.com> Wed Sep 18 05:43:46 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 18 05:43:46 2013 +0000
tree 8fc1715a74b13b2d60105f1c81f3de1eed7347df
parent 5ff6ebe2ed8322e2c94973d347c78d492db7ec24
parent 357b5be893088b4dcd69262d1dec7b6127cf567d

Merge "NPE when deleting draft patch set when previous draft already deleted" into stable-2.6

gerrit-server/src/main/java/com/google/gerrit/server/changedetail/DeleteDraftPatchSet.java

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
index adec292..d20b0f6 100644
--- 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 @@
       }
       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);
         }