opendev/gerrit
Code Issues Proposed changes

Merge "Fix possible synchronization issue in TaskThunk."

Browse Source
This commit is contained in:
Shawn Pearce
2012-05-18 11:51:16 -07:00
committed by gerrit code review
parent dbd1acba07 82acf915eb
commit b5a138a4df
1 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
gerrit-sshd/src/main/java/com/google/gerrit/sshd/BaseCommand.java
View File

@@ -389,55 +389,59 @@ public abstract class BaseCommand implements Command {
@Override
public void cancel() {
final Context old = SshScope.set(context);
try {
onExit(STATUS_CANCEL);
} finally {
SshScope.set(old);
synchronized (this) {
final Context old = SshScope.set(context);
try {
onExit(STATUS_CANCEL);
} finally {
SshScope.set(old);
}
}
}
@Override
public void run() {
final Thread thisThread = Thread.currentThread();
final String thisName = thisThread.getName();
int rc = 0;
final Context old = SshScope.set(context);
try {
context.started = System.currentTimeMillis();
thisThread.setName("SSH " + taskName);
if (thunk instanceof ProjectCommandRunnable) {
((ProjectCommandRunnable) thunk).executeParseCommand();
projectName = ((ProjectCommandRunnable) thunk).getProjectName();
}
synchronized (this) {
final Thread thisThread = Thread.currentThread();
final String thisName = thisThread.getName();
int rc = 0;
final Context old = SshScope.set(context);
try {
thunk.run();
} catch (NoSuchProjectException e) {
throw new UnloggedFailure(1, e.getMessage() + " no such project");
} catch (NoSuchChangeException e) {
throw new UnloggedFailure(1, e.getMessage() + " no such change");
}
context.started = System.currentTimeMillis();
thisThread.setName("SSH " + taskName);
if (thunk instanceof ProjectCommandRunnable) {
((ProjectCommandRunnable) thunk).executeParseCommand();
projectName = ((ProjectCommandRunnable) thunk).getProjectName();
}
try {
thunk.run();
} catch (NoSuchProjectException e) {
throw new UnloggedFailure(1, e.getMessage() + " no such project");
} catch (NoSuchChangeException e) {
throw new UnloggedFailure(1, e.getMessage() + " no such change");
}
out.flush();
err.flush();
} catch (Throwable e) {
try {
out.flush();
} catch (Throwable e2) {
}
try {
err.flush();
} catch (Throwable e2) {
}
rc = handleError(e);
} finally {
try {
onExit(rc);
} catch (Throwable e) {
try {
out.flush();
} catch (Throwable e2) {
}
try {
err.flush();
} catch (Throwable e2) {
}
rc = handleError(e);
} finally {
SshScope.set(old);
thisThread.setName(thisName);
try {
onExit(rc);
} finally {
SshScope.set(old);
thisThread.setName(thisName);
}
}
}
}