Merge branch 'stable-2.9'
* Fix reloading of configuration changes
Change-Id: I8290793aa1d8dc28eba8ca127c20650c621ed74f
Signed-off-by: Edwin Kempin <edwin.kempin@sap.com>
diff --git a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
index ece878d..639c025 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/serviceuser/GetConfig.java
@@ -41,20 +41,23 @@
class GetConfig implements RestReadView<ConfigResource> {
private static final Logger log = LoggerFactory.getLogger(GetConfig.class);
- private final PluginConfig cfg;
+ private final PluginConfigFactory cfgFactory;
+ private final String pluginName;
private final GroupCache groupCache;
private final GroupJson groupJson;
@Inject
public GetConfig(PluginConfigFactory cfgFactory,
@PluginName String pluginName, GroupCache groupCache, GroupJson groupJson) {
- this.cfg = cfgFactory.getFromGerritConfig(pluginName);
+ this.cfgFactory = cfgFactory;
+ this.pluginName = pluginName;
this.groupCache = groupCache;
this.groupJson = groupJson;
}
@Override
public ConfigInfo apply(ConfigResource rsrc) throws OrmException {
+ PluginConfig cfg = cfgFactory.getFromGerritConfig(pluginName);
ConfigInfo info = new ConfigInfo();
info.info = Strings.emptyToNull(cfg.getString("infoMessage"));
info.onSuccess = Strings.emptyToNull(cfg.getString("onSuccessMessage"));
