commit ac8a3d3b614e70488281e4a6a5a7daeb32583b9a
author Hugo Arès <hugo.ares@ericsson.com> Thu Mar 02 23:12:10 2017 -0500
committer Hugo Arès <hugo.ares@ericsson.com> Fri Mar 03 06:27:47 2017 -0500
tree b4be98f0d7a08de819704d599951997ab9d1217b
parent eb10d6d1b4e74b0688c21c015e9d39132bf5e3f0
parent 8845f2ff7818bf2fed6eaff2e80f5117d5f3134b

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Reindex the change after forcing patchset as draft

Change-Id: I94bd63c01056beb056f5ff8885071936b7619d24

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 4055450..3a25946 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,12 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.12'
+VER = '2.13'
 REPO = MAVEN_CENTRAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  sha1 = '8ce1f6e65078bbcf03a1758f96b3ebca19b7fe3c',
+  sha1 = 'e25d55b8f41627c4ae6b9d2069ec398638b219a3',
   license = 'Apache2.0',
   attach_source = False,
   repository = REPO,

src/main/java/com/googlesource/gerrit/plugins/forcedraft/ForceDraft.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/forcedraft/ForceDraft.java b/src/main/java/com/googlesource/gerrit/plugins/forcedraft/ForceDraft.java
index f0407db..1554c58 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/forcedraft/ForceDraft.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/forcedraft/ForceDraft.java
@@ -22,7 +22,7 @@
 import com.google.gerrit.reviewdb.client.PatchSet;
 import com.google.gerrit.reviewdb.server.ReviewDb;
 import com.google.gerrit.server.config.GerritServerConfig;
-import com.google.gerrit.server.index.ChangeIndexer;
+import com.google.gerrit.server.index.change.ChangeIndexer;
 import com.google.gerrit.sshd.CommandMetaData;
 import com.google.gerrit.sshd.SshCommand;
 import com.google.gerrit.common.data.GlobalCapability;
@@ -224,15 +224,12 @@
    */
   private void updatePatchSet() throws OrmException, IOException {
     Change.Status changeStatus = parentChange.getStatus();
-    switch (changeStatus) {
-      case NEW:
-        setPatchSetAsDraft();
-        changeIndexer.index(dbProvider.get(), updateChange());
-        break;
-      default:
-        sendUserInfo("Unable to set patch set as draft, change is "
-            + getStatusName(changeStatus));
-        break;
+    if (changeStatus == Change.Status.NEW) {
+      setPatchSetAsDraft();
+      changeIndexer.index(dbProvider.get(), updateChange());
+    } else {
+      sendUserInfo("Unable to set patch set as draft, change is "
+          + getStatusName(changeStatus));
     }
   }