Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Upgrade bazlets to latest stable-2.14
Change-Id: I1dc1759f2b192539d923e9ba0bb350fdd606d39e
diff --git a/WORKSPACE b/WORKSPACE
index fcb4b31..4683455 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "b07aa8462f2618a83f3b52d6150faa831b24d3e3",
+ commit = "ec949feac1b9dae6cc2c8c25d254f34924c54296",
#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");
}
}