Skip to content

Commit 580e5b6

Browse files
authored
add lock to submit tx to pool for verification and sync on shut down
1 parent 5720ee7 commit 580e5b6

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
import javafx.beans.property.LongProperty;
6969
import javafx.beans.property.ReadOnlyDoubleProperty;
7070
import javafx.beans.value.ChangeListener;
71-
import lombok.Getter;
7271
import monero.common.MoneroError;
7372
import monero.common.MoneroRpcConnection;
7473
import monero.common.MoneroRpcError;
@@ -145,8 +144,7 @@ public class XmrWalletService extends XmrWalletBase {
145144
private TradeManager tradeManager;
146145
private ExecutorService syncWalletThreadPool = Executors.newFixedThreadPool(10); // TODO: adjust based on connection type
147146

148-
@Getter
149-
public final Object lock = new Object();
147+
private final Object lock = new Object();
150148
private TaskLooper pollLooper;
151149
private boolean pollInProgress;
152150
private Long pollPeriodMs;
@@ -740,7 +738,7 @@ public MoneroTx verifyTradeTx(String offerId, BigInteger tradeFeeAmount, String
740738
MoneroDaemonRpc daemon = getDaemon();
741739
MoneroWallet wallet = getWallet();
742740
MoneroTx tx = null;
743-
synchronized (daemon) {
741+
synchronized (lock) {
744742
try {
745743

746744
// verify tx not submitted to pool
@@ -926,7 +924,7 @@ public void shutDown() {
926924
}
927925

928926
// shut down threads
929-
synchronized (getLock()) {
927+
synchronized (lock) {
930928
List<Runnable> shutDownThreads = new ArrayList<>();
931929
shutDownThreads.add(() -> ThreadUtils.shutDown(THREAD_ID));
932930
ThreadUtils.awaitTasks(shutDownThreads);

0 commit comments

Comments
 (0)