boldsuck/haveno
1
0
Fork 0
mirror of https://github.com/boldsuck/haveno.git synced 2024-12-23 04:29:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix concurrent modification exception when trades added to main view

Browse source
This commit is contained in:
woodser 2023-11-14 09:52:03 -05:00
parent f9afd44345
commit dd71423d95
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/src/main/java/haveno/core/trade/TradeManager.java
View file

@ -1157,11 +1157,13 @@ public class TradeManager implements PersistedDataHost, DecryptedDirectMessageLi
} }
public List<Trade> getAllTrades() { public List<Trade> getAllTrades() {
List<Trade> trades = new ArrayList<Trade>(); synchronized (tradableList) {
trades.addAll(tradableList.getList()); List<Trade> trades = new ArrayList<Trade>();
trades.addAll(closedTradableManager.getClosedTrades()); trades.addAll(tradableList.getList());
trades.addAll(failedTradesManager.getObservableList()); trades.addAll(closedTradableManager.getClosedTrades());
return trades; trades.addAll(failedTradesManager.getObservableList());
return trades;
}
} }
public List<Trade> getOpenTrades() { public List<Trade> getOpenTrades() {

2
desktop/src/main/java/haveno/desktop/main/MainViewModel.java
View file

@ -217,7 +217,7 @@ public class MainViewModel implements ViewModel, HavenoSetup.HavenoSetupListener
if (newValue) { if (newValue) {
tradeManager.applyTradePeriodState(); tradeManager.applyTradePeriodState();
tradeManager.getObservableList().forEach(trade -> { tradeManager.getOpenTrades().forEach(trade -> {
// check initialization error // check initialization error
if (trade.getInitError() != null) { if (trade.getInitError() != null) {