From 7fe5b80d392e2d48ff7c77265ed7ce49efd46ee9 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Fri, 30 Oct 2020 19:20:20 -0500 Subject: [PATCH 1/2] Add more logs --- .../main/java/bisq/core/trade/TradeDataValidation.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/bisq/core/trade/TradeDataValidation.java b/core/src/main/java/bisq/core/trade/TradeDataValidation.java index ef4665a502c..e21350e75fe 100644 --- a/core/src/main/java/bisq/core/trade/TradeDataValidation.java +++ b/core/src/main/java/bisq/core/trade/TradeDataValidation.java @@ -194,9 +194,17 @@ private static void testIfDisputeTriesReplay(Dispute disputeToTest, } } catch (IllegalArgumentException e) { + log.error("IllegalArgumentException at testIfDisputeTriesReplay: " + + "disputeToTest={}, disputesPerTradeId={}, disputesPerDelayedPayoutTxId={}, " + + "disputesPerDepositTxId={}", + disputeToTest, disputesPerTradeId, disputesPerDelayedPayoutTxId, disputesPerDepositTxId); throw new DisputeReplayException(disputeToTest, e.getMessage()); } catch (NullPointerException e) { - throw new DisputeReplayException(disputeToTest, e.toString()); + log.error("NullPointerException at testIfDisputeTriesReplay: " + + "disputeToTest={}, disputesPerTradeId={}, disputesPerDelayedPayoutTxId={}, " + + "disputesPerDepositTxId={}", + disputeToTest, disputesPerTradeId, disputesPerDelayedPayoutTxId, disputesPerDepositTxId); + throw new DisputeReplayException(disputeToTest, e.toString() + " at dispute " + disputeToTest.toString()); } } From f817018410677a728f8541ef7655d46aece2b077 Mon Sep 17 00:00:00 2001 From: chimp1984 Date: Fri, 30 Oct 2020 20:01:01 -0500 Subject: [PATCH 2/2] Add null checks, remove verbose logs from IllegalArgumentException branch --- .../java/bisq/core/trade/TradeDataValidation.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/core/src/main/java/bisq/core/trade/TradeDataValidation.java b/core/src/main/java/bisq/core/trade/TradeDataValidation.java index e21350e75fe..d0e8cc47c21 100644 --- a/core/src/main/java/bisq/core/trade/TradeDataValidation.java +++ b/core/src/main/java/bisq/core/trade/TradeDataValidation.java @@ -179,25 +179,23 @@ private static void testIfDisputeTriesReplay(Dispute disputeToTest, checkNotNull(disputeToTestUid, "agentsUid must not be null. Trade ID: " + disputeToTestTradeId); - checkArgument(disputesPerTradeId.get(disputeToTestTradeId).size() <= 2, + Set disputesPerTradeIdItems = disputesPerTradeId.get(disputeToTestTradeId); + checkArgument(disputesPerTradeIdItems != null && disputesPerTradeIdItems.size() <= 2, "We found more then 2 disputes with the same trade ID. " + "Trade ID: " + disputeToTestTradeId); if (!disputesPerDelayedPayoutTxId.isEmpty()) { - checkArgument(disputesPerDelayedPayoutTxId.get(disputeToTestDelayedPayoutTxId).size() <= 2, + Set disputesPerDelayedPayoutTxIdItems = disputesPerDelayedPayoutTxId.get(disputeToTestDelayedPayoutTxId); + checkArgument(disputesPerDelayedPayoutTxIdItems != null && disputesPerDelayedPayoutTxIdItems.size() <= 2, "We found more then 2 disputes with the same delayedPayoutTxId. " + "Trade ID: " + disputeToTestTradeId); } if (!disputesPerDepositTxId.isEmpty()) { - checkArgument(disputesPerDepositTxId.get(disputeToTestDepositTxId).size() <= 2, + Set disputesPerDepositTxIdItems = disputesPerDepositTxId.get(disputeToTestDepositTxId); + checkArgument(disputesPerDepositTxIdItems != null && disputesPerDepositTxIdItems.size() <= 2, "We found more then 2 disputes with the same depositTxId. " + "Trade ID: " + disputeToTestTradeId); } - } catch (IllegalArgumentException e) { - log.error("IllegalArgumentException at testIfDisputeTriesReplay: " + - "disputeToTest={}, disputesPerTradeId={}, disputesPerDelayedPayoutTxId={}, " + - "disputesPerDepositTxId={}", - disputeToTest, disputesPerTradeId, disputesPerDelayedPayoutTxId, disputesPerDepositTxId); throw new DisputeReplayException(disputeToTest, e.getMessage()); } catch (NullPointerException e) { log.error("NullPointerException at testIfDisputeTriesReplay: " +