yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-05 19:42:36 +02:00
Code Issues Releases Wiki Activity

GP-2268 corrected background task handling of aborted transaction

Browse source
This commit is contained in:
ghidra1 2022-07-01 12:28:22 -04:00
parent c48bf245c1
commit 6724f51f4f
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Ghidra/Framework/Project/src/main/java/ghidra/framework/plugintool/mgr/BackgroundCommandTask.java
View file

@ -17,6 +17,7 @@ package ghidra.framework.plugintool.mgr;
import java.rmi.ConnectException;
import db.NoTransactionException;
import db.TerminatedTransactionException;
import ghidra.framework.cmd.BackgroundCommand;
import ghidra.framework.model.*;
@ -35,7 +36,6 @@ class BackgroundCommandTask extends Task implements AbortedTransactionListener {
private BackgroundCommand cmd;
private ToolTaskManager taskMgr;
private UndoableDomainObject obj;
private TaskMonitor taskMonitor;
private boolean doneQueueProcessing;
@ -119,7 +119,6 @@ class BackgroundCommandTask extends Task implements AbortedTransactionListener {
if (isUnrecoverableException(t)) {
monitor.cancel();
taskMgr.clearTasks(obj);
return;
}
else if (!(t instanceof RollbackException)) {
String message =
@ -156,6 +155,7 @@ class BackgroundCommandTask extends Task implements AbortedTransactionListener {
//@formatter:off
return t instanceof ConnectException ||
t instanceof NoTransactionException ||
t instanceof TerminatedTransactionException ||
t instanceof DomainObjectLockedException ||
t instanceof ClosedException;
@ -164,6 +164,7 @@ class BackgroundCommandTask extends Task implements AbortedTransactionListener {
@Override
public void transactionAborted(long transactionID) {
Msg.warn(this, "Forced abort of background task transaction");
taskMonitor.cancel();
}