opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.6' into stable-2.7

Browse Source 
* stable-2.6:
  Fix reenabling of plugins
This commit is contained in:
Shawn Pearce
2013-08-31 18:14:56 -07:00
parent 6a25f558dc bae9e58ddd
commit b39e4d6a60
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommandProvider.java
View File

@@ -53,13 +53,17 @@ public class DispatchCommandProvider implements Provider<DispatchCommand> {
public RegistrationHandle register(final CommandName name, public RegistrationHandle register(final CommandName name,
final Provider<Command> cmd) { final Provider<Command> cmd) {
final ConcurrentMap<String, CommandProvider> m = getMap(); final ConcurrentMap<String, CommandProvider> m = getMap();
if (m.putIfAbsent(name.value(), new CommandProvider(cmd, null)) != null) { final CommandProvider commandProvider = new CommandProvider(cmd, null);
if (m.putIfAbsent(name.value(), commandProvider) != null) {
throw new IllegalArgumentException(name.value() + " exists"); throw new IllegalArgumentException(name.value() + " exists");
} }
return new RegistrationHandle() { return new RegistrationHandle() {
@Override @Override
public void remove() { public void remove() {
m.remove(name.value(), cmd); if (!m.remove(name.value(), commandProvider)) {
throw new IllegalStateException(String.format(
"can not unregister command: %s", name.value()));
}
} }
}; };
} }