Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-07-26 00:15:18 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug with too early removing address entries

Browse source
This commit is contained in:
Manfred Karrer 2016-04-17 19:59:39 +02:00
parent effea1f6b6
commit 6726504bd0
1 changed files with 8 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
core/src/main/java/io/bitsquare/arbitration/DisputeManager.java
View file

@ -463,13 +463,6 @@ public class DisputeManager {
log.warn("We got a dispute mail msg what we have already stored. TradeId = " + disputeCommunicationMessage.getTradeId()); log.warn("We got a dispute mail msg what we have already stored. TradeId = " + disputeCommunicationMessage.getTradeId());
dispute.setIsClosed(true); dispute.setIsClosed(true);
if (tradeManager.getTradeById(dispute.getTradeId()).isPresent())
tradeManager.closeDisputedTrade(dispute.getTradeId());
else {
Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOfferById(dispute.getTradeId());
if (openOfferOptional.isPresent())
openOfferManager.closeOpenOffer(openOfferOptional.get().getOffer());
}
if (dispute.disputeResultProperty().get() == null) { if (dispute.disputeResultProperty().get() == null) {
dispute.setDisputeResult(disputeResult); dispute.setDisputeResult(disputeResult);
@ -533,12 +526,14 @@ public class DisputeManager {
log.warn("We got a dispute msg what we have already stored. TradeId = " + disputeResult.tradeId); log.warn("We got a dispute msg what we have already stored. TradeId = " + disputeResult.tradeId);
} }
/* DisputeMailMessage disputeDirectMessage = disputeResult.getResultMailMessage(); // set state after payout as we call swapTradeEntryToAvailableEntry
if (!dispute.getDisputeMailMessagesAsObservableList().contains(disputeDirectMessage)) if (tradeManager.getTradeById(dispute.getTradeId()).isPresent())
dispute.addDisputeMessage(disputeDirectMessage); tradeManager.closeDisputedTrade(dispute.getTradeId());
else else {
log.warn("We got a dispute mail msg what we have already stored. TradeId = " + disputeDirectMessage.getTradeId());*/ Optional<OpenOffer> openOfferOptional = openOfferManager.getOpenOfferById(dispute.getTradeId());
if (openOfferOptional.isPresent())
openOfferManager.closeOpenOffer(openOfferOptional.get().getOffer());
}
} else { } else {
log.warn("We got a dispute result msg but we don't have a matching dispute. TradeId = " + disputeResult.tradeId); log.warn("We got a dispute result msg but we don't have a matching dispute. TradeId = " + disputeResult.tradeId);
} }