Merge pull request #6955 from yonson2023/fix_npe_persistence

Fix potential NPE in persistence of Contract.
bisq-network · Dec 20, 2023 · 99d45f7 · 99d45f7
2 parents 237c705 + c7f36b2
commit 99d45f7
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/core/src/main/java/bisq/core/trade/model/bisq_v1/Contract.java b/core/src/main/java/bisq/core/trade/model/bisq_v1/Contract.java
@@ -226,9 +226,10 @@ public protobuf.Contract toProtoMessage() {
                 .setTakerPayoutAddressString(takerPayoutAddressString)
                 .setMakerMultiSigPubKey(ByteString.copyFrom(makerMultiSigPubKey))
                 .setTakerMultiSigPubKey(ByteString.copyFrom(takerMultiSigPubKey))
-                .setLockTime(lockTime)
-                .setRefundAgentNodeAddress(refundAgentNodeAddress.toProtoMessage());
+                .setLockTime(lockTime);
 
+        Optional.ofNullable(refundAgentNodeAddress)  // bisq/issues/6953 refundAgentNodeAddress sometimes is null
+                .ifPresent(e -> builder.setRefundAgentNodeAddress(refundAgentNodeAddress.toProtoMessage()));
         Optional.ofNullable(hashOfMakersPaymentAccountPayload)
                 .ifPresent(e -> builder.setHashOfMakersPaymentAccountPayload(ByteString.copyFrom(hashOfMakersPaymentAccountPayload)));
         Optional.ofNullable(hashOfTakersPaymentAccountPayload)