nihilist/haveno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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() {
List<Trade> trades = new ArrayList<Trade>();
trades.addAll(tradableList.getList());
trades.addAll(closedTradableManager.getClosedTrades());
trades.addAll(failedTradesManager.getObservableList());
return trades;
synchronized (tradableList) {
List<Trade> trades = new ArrayList<Trade>();
trades.addAll(tradableList.getList());
trades.addAll(closedTradableManager.getClosedTrades());
trades.addAll(failedTradesManager.getObservableList());
return trades;
}
}
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) {
tradeManager.applyTradePeriodState();
tradeManager.getObservableList().forEach(trade -> {
tradeManager.getOpenTrades().forEach(trade -> {
// check initialization error
if (trade.getInitError() != null) {