commit 18a66467e0c3e14f5eb7c8a5ffd539e959acd9df
author Marco Miller <marco.miller@ericsson.com> Wed Oct 16 11:13:25 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Wed Oct 16 11:13:25 2019 -0400
tree 70e192396094fa7ecd82321e79f1efbfe0140832
parent c335c7777292ffd74eee2cf507d0ca70d42c02af
parent 072f8dc67bc20f560d5359e4f9de6b6fc32af208

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Replace bazel-genfiles with bazel-bin in documentation

Change-Id: I70ea61357ec662fa2e18325a437185d27bcd4f3d

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index d36bcd7..ae7d19b 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "bec81c8319e560d2a92ba0fe35d40d021ffd7708",
+    commit = "ae1cd231b0262b2738e6c0593eb3c504209ad4f5",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java b/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java
index def7916..d7694d9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/changemessage/rest/GetChangeInfo.java
@@ -19,6 +19,7 @@
 import com.google.gerrit.server.change.ChangeResource;
 import com.google.gerrit.server.config.PluginConfig;
 import com.google.gerrit.server.config.PluginConfigFactory;
+import com.google.gerrit.server.project.NoSuchProjectException;
 import com.google.inject.Inject;
 
 public class GetChangeInfo implements RestReadView<ChangeResource> {
@@ -32,10 +33,9 @@
   }
 
   @Override
-  public String apply(ChangeResource rsrc) {
+  public String apply(ChangeResource rsrc) throws NoSuchProjectException {
     PluginConfig cfg =
-        cfgFactory.getFromProjectConfigWithInheritance(
-            rsrc.getControl().getProjectControl().getProjectState(), pluginName);
+        cfgFactory.getFromProjectConfigWithInheritance(rsrc.getProject(), pluginName);
     return cfg.getString("changeInfo");
   }
 }