haveno-network/haveno-core
haveno-network/haveno-core
1
0
Fork 1
Code Issues 4 Pull requests Projects 5 Releases 1 Packages Wiki Activity Actions

skip polling if shut down started after acquiring lock

Browse source
This commit is contained in:
woodser 2025-06-01 15:15:35 -04:00 committed by woodser
parent 98130499a7
commit 3648c1eb0e
2 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/haveno/core/trade/Trade.java
View file

@ -2637,6 +2637,9 @@ public abstract class Trade extends XmrWalletBase implements Tradable, Model {
// poll wallet // poll wallet
try { try {
// skip if shut down started
if (isShutDownStarted) return;
// skip if payout unlocked // skip if payout unlocked
if (isPayoutUnlocked()) return; if (isPayoutUnlocked()) return;

21
core/src/main/java/haveno/core/xmr/wallet/XmrWalletService.java
View file

@ -1994,6 +1994,9 @@ public class XmrWalletService extends XmrWalletBase {
// poll wallet // poll wallet
try { try {
// skip if shut down started
if (isShutDownStarted) return;
// skip if daemon not synced // skip if daemon not synced
MoneroDaemonInfo lastInfo = xmrConnectionService.getLastInfo(); MoneroDaemonInfo lastInfo = xmrConnectionService.getLastInfo();
if (lastInfo == null) { if (lastInfo == null) {
@ -2059,16 +2062,16 @@ public class XmrWalletService extends XmrWalletBase {
pollInProgress = false; pollInProgress = false;
} }
} }
saveWalletWithDelay();
}
// cache wallet info last // cache wallet info last
synchronized (walletLock) { synchronized (walletLock) {
if (wallet != null && !isShutDownStarted) { if (wallet != null && !isShutDownStarted) {
try { try {
cacheWalletInfo(); cacheWalletInfo();
saveWalletWithDelay(); } catch (Exception e) {
} catch (Exception e) { log.warn("Error caching wallet info: " + e.getMessage() + "\n", e);
log.warn("Error caching wallet info: " + e.getMessage() + "\n", e);
}
} }
} }
} }