From 8855b58b1e7d84dbf9833990d03bd9cf665d07ca Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 2 Jun 2017 16:49:30 +0200 Subject: [PATCH] Transaction.toString(): Clearly state if script is missing. --- core/src/main/java/org/bitcoinj/core/Transaction.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/bitcoinj/core/Transaction.java b/core/src/main/java/org/bitcoinj/core/Transaction.java index bdfbf41e..656bc29b 100644 --- a/core/src/main/java/org/bitcoinj/core/Transaction.java +++ b/core/src/main/java/org/bitcoinj/core/Transaction.java @@ -27,6 +27,7 @@ import org.bitcoinj.utils.ExchangeRate; import org.bitcoinj.wallet.Wallet; import org.bitcoinj.wallet.WalletTransaction.Pool; +import com.google.common.base.Strings; import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Ints; import com.google.common.primitives.Longs; @@ -677,8 +678,8 @@ public class Transaction extends ChildMessage { s.append("in "); try { - Script scriptSig = in.getScriptSig(); - s.append(scriptSig); + String scriptSigStr = in.getScriptSig().toString(); + s.append(!Strings.isNullOrEmpty(scriptSigStr) ? scriptSigStr : ""); if (in.getValue() != null) s.append(" ").append(in.getValue().toFriendlyString()); s.append("\n "); @@ -711,8 +712,8 @@ public class Transaction extends ChildMessage { s.append(" "); s.append("out "); try { - Script scriptPubKey = out.getScriptPubKey(); - s.append(scriptPubKey); + String scriptPubKeyStr = out.getScriptPubKey().toString(); + s.append(!Strings.isNullOrEmpty(scriptPubKeyStr) ? scriptPubKeyStr : ""); s.append(" "); s.append(out.getValue().toFriendlyString()); if (!out.isAvailableForSpending()) {