Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-08 14:42:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix concurr. issues

Browse source
This commit is contained in:
Manfred Karrer 2016-05-25 21:10:07 +02:00
parent 49815176bb
commit 3a61409b5c
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/src/main/java/io/bitsquare/trade/TradeManager.java
View file

@ -61,6 +61,8 @@ import org.spongycastle.crypto.params.KeyParameter;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named; import javax.inject.Named;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Optional; import java.util.Optional;
import java.util.stream.Stream; import java.util.stream.Stream;
@ -173,17 +175,25 @@ public class TradeManager {
private void initPendingTrades() { private void initPendingTrades() {
Log.traceCall(); Log.traceCall();
List<Trade> toAdd = new ArrayList<>();
List<Trade> toRemove = new ArrayList<>();
for (Trade trade : trades) { for (Trade trade : trades) {
trade.setStorage(tradableListStorage); trade.setStorage(tradableListStorage);
if (trade.isDepositFeePaid()) { if (trade.isDepositFeePaid()) {
initTrade(trade, trade.getProcessModel().getUseSavingsWallet(), trade.getProcessModel().getFundsNeededForTrade()); initTrade(trade, trade.getProcessModel().getUseSavingsWallet(), trade.getProcessModel().getFundsNeededForTrade());
trade.updateDepositTxFromWallet(); trade.updateDepositTxFromWallet();
} else if (trade.isTakerFeePaid()) { } else if (trade.isTakerFeePaid()) {
addTradeToFailedTrades(trade); toAdd.add(trade);
} else { } else {
removePreparedTrade(trade); toRemove.add(trade);
} }
} }
for (Trade trade : toAdd) {
addTradeToFailedTrades(trade);
}
for (Trade trade : toRemove) {
removePreparedTrade(trade);
}
pendingTradesInitialized.set(true); pendingTradesInitialized.set(true);
} }