From 5b6797b317dfa4bdedd82d75875db55b21f35a8f Mon Sep 17 00:00:00 2001
From: Bruce Zu <bruce.zu@sonymobile.com>
Date: Tue, 4 Dec 2012 18:15:55 +0800
Subject: [PATCH] Fix NPE in ChangeUtil

Revert will run into NPE caused by [1].

[1] Line 250 of ChangeUtil.java
in https://gerrit-review.googlesource.com/#/c/40001

Change-Id: I527f675847f2e7c3c15259e6fbe1ad5b82d39faf
---
 .../src/main/java/com/google/gerrit/server/ChangeUtil.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
index 3ec1e3cc58..4658edf9dd 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/ChangeUtil.java
@@ -247,7 +247,8 @@ public class ChangeUtil {
           changeToRevert.getDest());
       change.setTopic(changeToRevert.getTopic());
 
-      PatchSet.Id id = nextPatchSetId(git, change.currentPatchSetId());
+      PatchSet.Id id =
+          new PatchSet.Id(change.getId(), Change.INITIAL_PATCH_SET_ID);
       final PatchSet ps = new PatchSet(id);
       ps.setCreatedOn(change.getCreatedOn());
       ps.setUploader(change.getOwner());