Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-11-23 13:17:42 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add null check for PayoutTx at startup

Browse source
This commit is contained in:
Manfred Karrer 2016-06-06 16:11:01 +02:00
parent 8eea1fab41
commit 9869b64352
4 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsOffererProtocol.java
View file

@ -54,7 +54,8 @@ public class BuyerAsOffererProtocol extends TradeProtocol implements BuyerProtoc
// If we are after the time lock state we need to setup the listener again // If we are after the time lock state we need to setup the listener again
Trade.State tradeState = trade.getState(); Trade.State tradeState = trade.getState();
if ((tradeState.getPhase() == Trade.Phase.FIAT_RECEIVED || tradeState.getPhase() == Trade.Phase.PAYOUT_PAID) && tradeState != Trade.State.PAYOUT_BROAD_CASTED) { Trade.Phase phase = tradeState.getPhase();
if (trade.getPayoutTx() != null && (phase == Trade.Phase.FIAT_RECEIVED || phase == Trade.Phase.PAYOUT_PAID) && tradeState != Trade.State.PAYOUT_BROAD_CASTED) {
TradeTaskRunner taskRunner = new TradeTaskRunner(trade, TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
() -> { () -> {

3
core/src/main/java/io/bitsquare/trade/protocol/trade/BuyerAsTakerProtocol.java
View file

@ -53,7 +53,8 @@ public class BuyerAsTakerProtocol extends TradeProtocol implements BuyerProtocol
// If we are after the timeLock state we need to setup the listener again // If we are after the timeLock state we need to setup the listener again
Trade.State tradeState = trade.getState(); Trade.State tradeState = trade.getState();
if ((tradeState.getPhase() == Trade.Phase.FIAT_RECEIVED || tradeState.getPhase() == Trade.Phase.PAYOUT_PAID) && tradeState != Trade.State.PAYOUT_BROAD_CASTED) { Trade.Phase phase = tradeState.getPhase();
if (trade.getPayoutTx() != null && (phase == Trade.Phase.FIAT_RECEIVED || phase == Trade.Phase.PAYOUT_PAID) && tradeState != Trade.State.PAYOUT_BROAD_CASTED) {
TradeTaskRunner taskRunner = new TradeTaskRunner(trade, TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
() -> { () -> {
handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener"); handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener");

3
core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsOffererProtocol.java
View file

@ -53,7 +53,8 @@ public class SellerAsOffererProtocol extends TradeProtocol implements SellerProt
// If we are after the time lock state we need to setup the listener again // If we are after the time lock state we need to setup the listener again
//TODO not sure if that is not called already from the checkPayoutTxTimeLock at tradeProtocol //TODO not sure if that is not called already from the checkPayoutTxTimeLock at tradeProtocol
Trade.State tradeState = trade.getState(); Trade.State tradeState = trade.getState();
if ((tradeState.getPhase() == Trade.Phase.FIAT_RECEIVED || tradeState.getPhase() == Trade.Phase.PAYOUT_PAID) && tradeState != Trade.State.PAYOUT_BROAD_CASTED) { Trade.Phase phase = tradeState.getPhase();
if (trade.getPayoutTx() != null && (phase == Trade.Phase.FIAT_RECEIVED || phase == Trade.Phase.PAYOUT_PAID) && tradeState != Trade.State.PAYOUT_BROAD_CASTED) {
TradeTaskRunner taskRunner = new TradeTaskRunner(trade, TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
() -> { () -> {
handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener"); handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener");

3
core/src/main/java/io/bitsquare/trade/protocol/trade/SellerAsTakerProtocol.java
View file

@ -55,7 +55,8 @@ public class SellerAsTakerProtocol extends TradeProtocol implements SellerProtoc
// If we are after the timeLock state we need to setup the listener again // If we are after the timeLock state we need to setup the listener again
//TODO not sure if that is not called already from the checkPayoutTxTimeLock at tradeProtocol //TODO not sure if that is not called already from the checkPayoutTxTimeLock at tradeProtocol
Trade.State tradeState = trade.getState(); Trade.State tradeState = trade.getState();
if ((tradeState.getPhase() == Trade.Phase.FIAT_RECEIVED || tradeState.getPhase() == Trade.Phase.PAYOUT_PAID) && tradeState != Trade.State.PAYOUT_BROAD_CASTED) { Trade.Phase phase = tradeState.getPhase();
if (trade.getPayoutTx() != null && (phase == Trade.Phase.FIAT_RECEIVED || phase == Trade.Phase.PAYOUT_PAID) && tradeState != Trade.State.PAYOUT_BROAD_CASTED) {
TradeTaskRunner taskRunner = new TradeTaskRunner(trade, TradeTaskRunner taskRunner = new TradeTaskRunner(trade,
() -> { () -> {
handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener"); handleTaskRunnerSuccess("SetupPayoutTxLockTimeReachedListener");