opendev/gerrit
Code Issues Proposed changes

Push Command.destroy down through DispatchCommand redirection

Browse Source 
When we redirect through a DispatchCommand to a different name we
need to ensure the destroy event is pushed down too, in case the
daemon terminates before the command is run.

Change-Id: Idc4446f4a0426aadcbb03c48ff2321071cded25b
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Shawn O. Pearce
2010-01-02 18:43:34 -08:00
parent cf7b3cea79
commit d6c0cc1069
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gerrit-sshd/src/main/java/com/google/gerrit/sshd/DispatchCommand.java
View File

@@ -37,6 +37,7 @@ final class DispatchCommand extends BaseCommand {
private final Provider<CurrentUser> currentUser; private final Provider<CurrentUser> currentUser;
private final String prefix; private final String prefix;
private final Map<String, Provider<Command>> commands; private final Map<String, Provider<Command>> commands;
private Command cmd;
@Inject @Inject
DispatchCommand(final Provider<CurrentUser> cu, @Assisted final String pfx, DispatchCommand(final Provider<CurrentUser> cu, @Assisted final String pfx,
@@ -74,6 +75,11 @@ final class DispatchCommand extends BaseCommand {
final Provider<Command> p = commands.get(name); final Provider<Command> p = commands.get(name);
if (p != null) { if (p != null) {
final Command cmd = p.get(); final Command cmd = p.get();
synchronized (this) {
this.cmd = cmd;
}
if (cmd.getClass().getAnnotation(AdminCommand.class) != null) { if (cmd.getClass().getAnnotation(AdminCommand.class) != null) {
final CurrentUser u = currentUser.get(); final CurrentUser u = currentUser.get();
if (!u.isAdministrator()) { if (!u.isAdministrator()) {
@@ -102,6 +108,16 @@ final class DispatchCommand extends BaseCommand {
} }
} }
@Override
public void destroy() {
synchronized (this) {
if (cmd != null) {
cmd.destroy();
cmd = null;
}
}
}
private void usage() throws IOException, UnsupportedEncodingException { private void usage() throws IOException, UnsupportedEncodingException {
final StringBuilder usage = new StringBuilder(); final StringBuilder usage = new StringBuilder();
if (prefix.indexOf(' ') < 0) { if (prefix.indexOf(' ') < 0) {