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

check if trade shut down started within lock

Browse Source
This commit is contained in:
woodser 2024-01-25 11:43:53 -05:00
parent 33bd4587c4
commit 2a2eb0c82f
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/haveno/core/trade/protocol/BuyerProtocol.java
View File

@ -54,11 +54,9 @@ public class BuyerProtocol extends DisputeProtocol {
protected void onInitialized() { protected void onInitialized() {
super.onInitialized(); super.onInitialized();
// done if shut down
if (trade.isShutDown()) return;
// re-send payment sent message if not acked // re-send payment sent message if not acked
synchronized (trade) { synchronized (trade) {
if (trade.isShutDownStarted()) return;
if (trade.getState().ordinal() >= Trade.State.BUYER_SENT_PAYMENT_SENT_MSG.ordinal() && trade.getState().ordinal() < Trade.State.SELLER_RECEIVED_PAYMENT_SENT_MSG.ordinal()) { if (trade.getState().ordinal() >= Trade.State.BUYER_SENT_PAYMENT_SENT_MSG.ordinal() && trade.getState().ordinal() < Trade.State.SELLER_RECEIVED_PAYMENT_SENT_MSG.ordinal()) {
latchTrade(); latchTrade();
given(anyPhase(Trade.Phase.PAYMENT_SENT) given(anyPhase(Trade.Phase.PAYMENT_SENT)

4
core/src/main/java/haveno/core/trade/protocol/SellerProtocol.java
View File

@ -50,11 +50,9 @@ public class SellerProtocol extends DisputeProtocol {
protected void onInitialized() { protected void onInitialized() {
super.onInitialized(); super.onInitialized();
// done if shut down
if (trade.isShutDown()) return;
// re-send payment received message if payout not published // re-send payment received message if payout not published
synchronized (trade) { synchronized (trade) {
if (trade.isShutDownStarted()) return;
if (trade.getState().ordinal() >= Trade.State.SELLER_SENT_PAYMENT_RECEIVED_MSG.ordinal() && !trade.isPayoutPublished()) { if (trade.getState().ordinal() >= Trade.State.SELLER_SENT_PAYMENT_RECEIVED_MSG.ordinal() && !trade.isPayoutPublished()) {
latchTrade(); latchTrade();
given(anyPhase(Trade.Phase.PAYMENT_RECEIVED) given(anyPhase(Trade.Phase.PAYMENT_RECEIVED)