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

Add null check for storage

Browse source
This commit is contained in:
Manfred Karrer 2016-01-18 23:32:59 +01:00
parent 276e02e102
commit d88c0bc2e6
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
core/src/main/java/io/bitsquare/trade/Trade.java
View file

@ -141,6 +141,7 @@ abstract public class Trade implements Tradable, Model, Serializable {
transient private ObjectProperty<DisputeState> disputeStateProperty; transient private ObjectProperty<DisputeState> disputeStateProperty;
transient private ObjectProperty<TradePeriodState> tradePeriodStateProperty; transient private ObjectProperty<TradePeriodState> tradePeriodStateProperty;
// Trades are saved in the TradeList // Trades are saved in the TradeList
@Nullable
transient private Storage<? extends TradableList> storage; transient private Storage<? extends TradableList> storage;
transient protected TradeProtocol tradeProtocol; transient protected TradeProtocol tradeProtocol;
@ -271,7 +272,7 @@ abstract public class Trade implements Tradable, Model, Serializable {
log.debug("setDepositTx " + tx); log.debug("setDepositTx " + tx);
this.depositTx = tx; this.depositTx = tx;
setupConfidenceListener(); setupConfidenceListener();
storage.queueUpForSave(); persist();
} }
@Nullable @Nullable
@ -300,13 +301,14 @@ abstract public class Trade implements Tradable, Model, Serializable {
public void setState(State state) { public void setState(State state) {
this.state = state; this.state = state;
processStateProperty.set(state); processStateProperty.set(state);
storage.queueUpForSave(); persist();
persist();
} }
public void setDisputeState(DisputeState disputeState) { public void setDisputeState(DisputeState disputeState) {
this.disputeState = disputeState; this.disputeState = disputeState;
disputeStateProperty.set(disputeState); disputeStateProperty.set(disputeState);
storage.queueUpForSave(); persist();
} }
public DisputeState getDisputeState() { public DisputeState getDisputeState() {
@ -316,7 +318,7 @@ abstract public class Trade implements Tradable, Model, Serializable {
public void setTradePeriodState(TradePeriodState tradePeriodState) { public void setTradePeriodState(TradePeriodState tradePeriodState) {
this.tradePeriodState = tradePeriodState; this.tradePeriodState = tradePeriodState;
tradePeriodStateProperty.set(tradePeriodState); tradePeriodStateProperty.set(tradePeriodState);
storage.queueUpForSave(); persist();
} }
public TradePeriodState getTradePeriodState() { public TradePeriodState getTradePeriodState() {
@ -339,12 +341,13 @@ abstract public class Trade implements Tradable, Model, Serializable {
// Get called from taskRunner after each completed task // Get called from taskRunner after each completed task
@Override @Override
public void persist() { public void persist() {
storage.queueUpForSave(); if (storage != null)
storage.queueUpForSave();
} }
@Override @Override
public void onComplete() { public void onComplete() {
storage.queueUpForSave(); persist();
} }
@ -534,7 +537,7 @@ abstract public class Trade implements Tradable, Model, Serializable {
public void setHalfTradePeriodReachedWarningDisplayed(boolean halfTradePeriodReachedWarningDisplayed) { public void setHalfTradePeriodReachedWarningDisplayed(boolean halfTradePeriodReachedWarningDisplayed) {
this.halfTradePeriodReachedWarningDisplayed = halfTradePeriodReachedWarningDisplayed; this.halfTradePeriodReachedWarningDisplayed = halfTradePeriodReachedWarningDisplayed;
storage.queueUpForSave(); persist();
} }
public boolean isHalfTradePeriodReachedWarningDisplayed() { public boolean isHalfTradePeriodReachedWarningDisplayed() {
@ -543,7 +546,7 @@ abstract public class Trade implements Tradable, Model, Serializable {
public void setTradePeriodOverWarningDisplayed(boolean tradePeriodOverWarningDisplayed) { public void setTradePeriodOverWarningDisplayed(boolean tradePeriodOverWarningDisplayed) {
this.tradePeriodOverWarningDisplayed = tradePeriodOverWarningDisplayed; this.tradePeriodOverWarningDisplayed = tradePeriodOverWarningDisplayed;
storage.queueUpForSave(); persist();
} }
public boolean isTradePeriodOverWarningDisplayed() { public boolean isTradePeriodOverWarningDisplayed() {