Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-12-18 09:12:19 -05:00
Code Issues Projects Releases Packages Wiki Activity

Move closeDisputedTrade call inside success handler

Browse source
This commit is contained in:
Manfred Karrer 2016-06-06 14:06:08 +02:00
parent d7f996946e
commit 5b395dff3d
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -507,6 +507,15 @@ public class DisputeManager {
dispute.setDisputePayoutTxId(transaction.getHashAsString()); dispute.setDisputePayoutTxId(transaction.getHashAsString());
sendPeerPublishedPayoutTxMessage(transaction, dispute, contract); sendPeerPublishedPayoutTxMessage(transaction, dispute, contract);
// set state after payout as we call swapTradeEntryToAvailableEntry
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());
}
} }
@Override @Override
@ -517,6 +526,7 @@ public class DisputeManager {
}); });
} catch (AddressFormatException | WalletException | TransactionVerificationException e) { } catch (AddressFormatException | WalletException | TransactionVerificationException e) {
e.printStackTrace(); e.printStackTrace();
log.error("Error at traderSignAndFinalizeDisputedPayoutTx " + e.getMessage());
} }
} else { } else {
log.warn("DepositTx is null. TradeId = " + disputeResult.tradeId); log.warn("DepositTx is null. TradeId = " + disputeResult.tradeId);
@ -525,15 +535,6 @@ public class DisputeManager {
} else { } else {
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);
} }
// set state after payout as we call swapTradeEntryToAvailableEntry
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());
}
} 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);
} }