Merge pull request #2903 from sqrrm/better-null-tx-handling

Check not null tx
bisq-network · Jun 19, 2019 · e52cff8 · e52cff8
2 parents 386209b + 4243776
commit e52cff8
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/.../src/main/java/bisq/core/dao/state/unconfirmed/UnconfirmedBsqChangeOutputListService.java b/.../src/main/java/bisq/core/dao/state/unconfirmed/UnconfirmedBsqChangeOutputListService.java
@@ -153,7 +153,8 @@ public void onReorganize() {
     }
 
     public void onTransactionConfidenceChanged(Transaction tx) {
-        if (tx.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING) {
+        if (tx != null &&
+                tx.getConfidence().getConfidenceType() == TransactionConfidence.ConfidenceType.BUILDING) {
             removeConnectedOutputsOfInputsOfTx(tx);
 
             tx.getOutputs().forEach(transactionOutput -> {