opendev/gerrit
Code Issues Proposed changes

Copy bindings from db injector to plugin environment

Browse Source 
Some basic bindings aren't copied to plugin environment that were
defined in SchemaModule, e.g. AllProjectsName.

Bug: Issue 3163
Change-Id: I7b07f6658c4b5d0dd997039e85f4373e57c4650f
This commit is contained in:
David Ostrovsky
2015-01-30 00:38:21 +01:00
committed by David Ostrovsky
parent 6a78963c0c
commit 05cde2836c
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
View File

@@ -275,7 +275,7 @@ public class Daemon extends SiteProgram {
cfgInjector = createCfgInjector(); cfgInjector = createCfgInjector();
sysInjector = createSysInjector(); sysInjector = createSysInjector();
sysInjector.getInstance(PluginGuiceEnvironment.class) sysInjector.getInstance(PluginGuiceEnvironment.class)
.setCfgInjector(cfgInjector); .setDbCfgInjector(dbInjector, cfgInjector);
manager.add(dbInjector, cfgInjector, sysInjector); manager.add(dbInjector, cfgInjector, sysInjector);
sshd &= !sshdOff(); sshd &= !sshdOff();

4
gerrit-server/src/main/java/com/google/gerrit/server/plugins/PluginGuiceEnvironment.java
View File

@@ -149,13 +149,15 @@ public class PluginGuiceEnvironment {
return sysModule; return sysModule;
} }
public void setCfgInjector(Injector cfgInjector) { public void setDbCfgInjector(Injector dbInjector, Injector cfgInjector) {
final Module db = copy(dbInjector);
final Module cm = copy(cfgInjector); final Module cm = copy(cfgInjector);
final Module sm = copy(sysInjector); final Module sm = copy(sysInjector);
sysModule = new AbstractModule() { sysModule = new AbstractModule() {
@Override @Override
protected void configure() { protected void configure() {
install(copyConfigModule); install(copyConfigModule);
install(db);
install(cm); install(cm);
install(sm); install(sm);
} }

2
gerrit-war/src/main/java/com/google/gerrit/httpd/WebAppInitializer.java
View File

@@ -167,7 +167,7 @@ public class WebAppInitializer extends GuiceServletContextListener
webInjector = createWebInjector(); webInjector = createWebInjector();
PluginGuiceEnvironment env = sysInjector.getInstance(PluginGuiceEnvironment.class); PluginGuiceEnvironment env = sysInjector.getInstance(PluginGuiceEnvironment.class);
env.setCfgInjector(cfgInjector); env.setDbCfgInjector(dbInjector, cfgInjector);
if (sshInjector != null) { if (sshInjector != null) {
env.setSshInjector(sshInjector); env.setSshInjector(sshInjector);
} }