Ensure GitCommand's "callable" guard is thread-safe
This way we can ensure that the same command instance can't be used concurrently in multiple threads. Bug: 458023 Change-Id: I4884a1ef2f609f9fb24dda4bd5819dffb9f174b6 Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
parent
e7f153bf3a
commit
1a729bec9c
|
@ -39,6 +39,7 @@
|
|||
|
||||
import java.text.MessageFormat;
|
||||
import java.util.concurrent.Callable;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import org.eclipse.jgit.api.errors.GitAPIException;
|
||||
import org.eclipse.jgit.internal.JGitText;
|
||||
|
@ -71,7 +72,7 @@ public abstract class GitCommand<T> implements Callable<T> {
|
|||
* a state which tells whether it is allowed to call {@link #call()} on this
|
||||
* instance.
|
||||
*/
|
||||
private boolean callable = true;
|
||||
private AtomicBoolean callable = new AtomicBoolean(true);
|
||||
|
||||
/**
|
||||
* Creates a new command which interacts with a single repository
|
||||
|
@ -100,7 +101,7 @@ public Repository getRepository() {
|
|||
* this instance.
|
||||
*/
|
||||
protected void setCallable(boolean callable) {
|
||||
this.callable = callable;
|
||||
this.callable.set(callable);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -112,7 +113,7 @@ protected void setCallable(boolean callable) {
|
|||
* is {@code false}
|
||||
*/
|
||||
protected void checkCallable() {
|
||||
if (!callable)
|
||||
if (!callable.get())
|
||||
throw new IllegalStateException(MessageFormat.format(
|
||||
JGitText.get().commandWasCalledInTheWrongState
|
||||
, this.getClass().getName()));
|
||||
|
|
Loading…
Reference in New Issue