mirror of
https://github.com/bisq-network/bisq.git
synced 2025-02-23 15:00:30 +01:00
Merge branch 'logging' of https://github.com/oscarguindzberg/bisq into oscarguindzberg-logging
# Conflicts: # core/src/main/java/bisq/core/arbitration/DisputeManager.java
This commit is contained in:
commit
aa92c8131b
1 changed files with 2 additions and 4 deletions
|
@ -997,9 +997,8 @@ public class DisputeManager implements PersistedDataHost {
|
|||
success = true;
|
||||
}
|
||||
} catch (TransactionVerificationException e) {
|
||||
e.printStackTrace();
|
||||
errorMessage = "Error at traderSignAndFinalizeDisputedPayoutTx " + e.toString();
|
||||
log.error(errorMessage);
|
||||
log.error(errorMessage, e);
|
||||
success = false;
|
||||
|
||||
// We prefer to close the dispute in that case. If there was no deposit tx and a random tx was used
|
||||
|
@ -1014,9 +1013,8 @@ public class DisputeManager implements PersistedDataHost {
|
|||
|
||||
throw new RuntimeException(errorMessage);
|
||||
} catch (AddressFormatException | WalletException e) {
|
||||
e.printStackTrace();
|
||||
errorMessage = "Error at traderSignAndFinalizeDisputedPayoutTx " + e.toString();
|
||||
log.error(errorMessage);
|
||||
log.error(errorMessage, e);
|
||||
success = false;
|
||||
throw new RuntimeException(errorMessage);
|
||||
} finally {
|
||||
|
|
Loading…
Add table
Reference in a new issue