From 4c970fa0aa13fc45d99b2c9fdea86a0423c84557 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 13 Oct 2018 10:35:30 +0000
Subject: [PATCH] Data: SPK log tweaks
---
core/java/src/net/i2p/data/SigningPrivateKey.java | 4 ++--
core/java/src/net/i2p/data/SigningPublicKey.java | 7 +++++--
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/core/java/src/net/i2p/data/SigningPrivateKey.java b/core/java/src/net/i2p/data/SigningPrivateKey.java
index fcc9b2dc86..7e6c304621 100644
--- a/core/java/src/net/i2p/data/SigningPrivateKey.java
+++ b/core/java/src/net/i2p/data/SigningPrivateKey.java
@@ -94,14 +94,14 @@ public class SigningPrivateKey extends SimpleDataStructure {
@Override
public String toString() {
StringBuilder buf = new StringBuilder(64);
- buf.append('[').append(getClass().getSimpleName()).append(' ').append(_type).append(": ");
+ buf.append("[SigningPrivateKey ").append(_type).append(": ");
int length = length();
if (_data == null) {
buf.append("null");
} else if (length <= 32) {
buf.append(toBase64());
} else {
- buf.append("size: ").append(Integer.toString(length));
+ buf.append("size: ").append(length);
}
buf.append(']');
return buf.toString();
diff --git a/core/java/src/net/i2p/data/SigningPublicKey.java b/core/java/src/net/i2p/data/SigningPublicKey.java
index 2c28e3b241..8e7dacfba3 100644
--- a/core/java/src/net/i2p/data/SigningPublicKey.java
+++ b/core/java/src/net/i2p/data/SigningPublicKey.java
@@ -202,11 +202,14 @@ public class SigningPublicKey extends SimpleDataStructure {
@Override
public String toString() {
StringBuilder buf = new StringBuilder(64);
- buf.append('[').append(getClass().getSimpleName()).append(' ').append(_type).append(": ");
+ buf.append("[SigningPublicKey ").append((_type != null) ? _type.toString() : "unknown type").append(' ');
+ int length = length();
if (_data == null) {
buf.append("null");
+ } else if (length <= 32) {
+ buf.append(toBase64());
} else {
- buf.append("size: ").append(Integer.toString(length()));
+ buf.append("size: ").append(length);
}
buf.append(']');
return buf.toString();
--
GitLab