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

protocols skip resending payment sent/received if shut down

Browse Source
This commit is contained in:
woodser 2024-01-07 22:37:41 -05:00
parent 3173f20c4b
commit a6f6f5c00a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +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.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()) {

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

@ -50,6 +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.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()) {