Fix double bound exception when loading extensions
ServerInformation class is already bound, therefore it shouldn't be bound second time for gerrit extensions. Change-Id: I0450989836b8752e774bee28a94dbca3e0bcf3fc Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
This commit is contained in:
@@ -20,7 +20,6 @@ import com.google.gerrit.extensions.annotations.PluginData;
|
|||||||
import com.google.gerrit.extensions.annotations.PluginName;
|
import com.google.gerrit.extensions.annotations.PluginName;
|
||||||
import com.google.gerrit.extensions.registration.RegistrationHandle;
|
import com.google.gerrit.extensions.registration.RegistrationHandle;
|
||||||
import com.google.gerrit.extensions.registration.ReloadableRegistrationHandle;
|
import com.google.gerrit.extensions.registration.ReloadableRegistrationHandle;
|
||||||
import com.google.gerrit.extensions.systemstatus.ServerInformation;
|
|
||||||
import com.google.gerrit.lifecycle.LifecycleManager;
|
import com.google.gerrit.lifecycle.LifecycleManager;
|
||||||
import com.google.inject.AbstractModule;
|
import com.google.inject.AbstractModule;
|
||||||
import com.google.inject.Guice;
|
import com.google.inject.Guice;
|
||||||
@@ -231,13 +230,6 @@ public class Plugin {
|
|||||||
modules.add(env.getSysModule());
|
modules.add(env.getSysModule());
|
||||||
if (apiType == ApiType.PLUGIN) {
|
if (apiType == ApiType.PLUGIN) {
|
||||||
modules.add(env.getSysModule());
|
modules.add(env.getSysModule());
|
||||||
} else {
|
|
||||||
modules.add(new AbstractModule() {
|
|
||||||
@Override
|
|
||||||
protected void configure() {
|
|
||||||
bind(ServerInformation.class).toInstance(env.getServerInformation());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
modules.add(new AbstractModule() {
|
modules.add(new AbstractModule() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user