diff options
author | Dave Borowitz <dborowitz@google.com> | 2013-09-18 12:51:50 -0700 |
---|---|---|
committer | Dave Borowitz <dborowitz@google.com> | 2013-09-18 12:52:02 -0700 |
commit | a32c3cedd67ab37389c0287afb01885916d019b5 (patch) | |
tree | a7982b80d0b2a4b4c9ecfd4c8157679a0bd6c713 | |
parent | 33476285103487fd57f95aa8879f1de0e9460537 (diff) | |
parent | 6b12b35d2a6aa151e9cafe9a052b5f6f2ced7211 (diff) |
Merge branch 'stable-2.6' into stable-2.7
* stable-2.6:
Fix installation of plugins
Change-Id: I6742a5cd3417633be2ad8347f8ebea2fdcc07b88
-rw-r--r-- | gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java | 10 |
1 files changed, 4 insertions, 6 deletions
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 c7594bc6d1..ce1da95fed 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 @@ public class DispatchCommandProvider implements Provider<DispatchCommand> { 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 class DispatchCommandProvider implements Provider<DispatchCommand> { 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); } }; } |