Remove unreachable code in Daemon.createSshInjector
createSshInjector is only invoked when this.sshd is true. Therefore,
the else branch is never used.
The usage of the NoSshModule is handled in the createWebInjector method.
Change-Id: Icc8e20d882387966f35cc5062483229f135bdc57
diff --git a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
index 579186e..c7e8454 100644
--- a/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
+++ b/gerrit-pgm/src/main/java/com/google/gerrit/pgm/Daemon.java
@@ -363,18 +363,14 @@
private Injector createSshInjector() {
final List<Module> modules = new ArrayList<Module>();
- if (sshd) {
- modules.add(sysInjector.getInstance(SshModule.class));
- if (!test) {
- modules.add(new SshHostKeyModule());
- }
- if (slave) {
- modules.add(new SlaveCommandModule());
- } else {
- modules.add(new MasterCommandModule());
- }
+ modules.add(sysInjector.getInstance(SshModule.class));
+ if (!test) {
+ modules.add(new SshHostKeyModule());
+ }
+ if (slave) {
+ modules.add(new SlaveCommandModule());
} else {
- modules.add(new NoSshModule());
+ modules.add(new MasterCommandModule());
}
return sysInjector.createChildInjector(modules);
}
