Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Upgrade bazlets to latest stable-2.14 to build with 2.14.16 API
Change-Id: I693f77cba24999c7227e14dad34a42fad1e4743a
diff --git a/WORKSPACE b/WORKSPACE
index 655dffd..21da1be 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "b17f700875f5f2a96942d434516ba8e6088463d4",
+ commit = "6d3fd710ea4ca44805bb8c858d72b53bd3a500f3",
#local_path = "/home/<user>/projects/bazlets",
)
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");
}
}