Merge branch 'stable-2.6' into stable-2.7
* stable-2.6:
Fix installation of plugins
Change-Id: I6742a5cd3417633be2ad8347f8ebea2fdcc07b88
diff --git a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java
index c7594bc..ce1da95 100644
--- a/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java
+++ b/gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java
@@ -60,10 +60,7 @@
return new RegistrationHandle() {
@Override
public void remove() {
- if (!m.remove(name.value(), commandProvider)) {
- throw new IllegalStateException(String.format(
- "can not unregister command: %s", name.value()));
- }
+ m.remove(name.value(), commandProvider);
}
};
}
@@ -71,11 +68,12 @@
public RegistrationHandle replace(final CommandName name,
final Provider<Command> cmd) {
final ConcurrentMap<String, CommandProvider> m = getMap();
- m.put(name.value(), new CommandProvider(cmd, null));
+ final CommandProvider commandProvider = new CommandProvider(cmd, null);
+ m.put(name.value(), commandProvider);
return new RegistrationHandle() {
@Override
public void remove() {
- m.remove(name.value(), cmd);
+ m.remove(name.value(), commandProvider);
}
};
}
