propagate from branch 'i2p.i2p.zzz.test' (head c92ec83848e87e27921bada8ee24fd108050a50a)

to branch 'i2p.i2p' (head efebdaa0f53b9bc0234d18a7a934cc0f4fa6231e)
2009-03-24 21:30:28 +00:00
parent 41718b47c1 0da964e47f
commit 186f2bc22f
9 changed files with 141 additions and 41 deletions
--- a/core/java/src/net/i2p/data/PrivateKeyFile.java
+++ b/core/java/src/net/i2p/data/PrivateKeyFile.java
@ -261,7 +261,7 @@ public class PrivateKeyFile {
    public String toString() {
        StringBuffer s = new StringBuffer(128);
        s.append("Dest: ");
-        s.append(this.dest.toBase64());
+        s.append(this.dest != null ? this.dest.toBase64() : "null");
        s.append("\nContains: ");
        s.append(this.dest);
        s.append("\nPrivate Key: ");