[freenet-cvs] r7869 - trunk/freenet/src/freenet/node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-17 14:11:10 +0000 (Tue, 17 Jan 2006)
New Revision: 7869

Modified:
   trunk/freenet/src/freenet/node/Node.java
   trunk/freenet/src/freenet/node/Version.java
Log:
359: (mandatory)
Fix NPE that was probably breaking all SSK requests.

Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java    2006-01-17 13:53:14 UTC (rev 
7868)
+++ trunk/freenet/src/freenet/node/Node.java    2006-01-17 14:11:10 UTC (rev 
7869)
@@ -993,7 +993,7 @@
                        DSAPublicKey pubKey = k.getPubKey();
                        if(pubKey == null) {
                                pubKey = getKey(k.getPubKeyHash());
-                               Logger.minor(this, "Got pubkey: "+pubKey+" 
"+pubKey.writeAsField());
+                               Logger.minor(this, "Got pubkey: "+pubKey+" 
"+(pubKey == null ? "" : pubKey.writeAsField()));
                                try {
                                                k.setPubKey(pubKey);
                                        } catch (SSKVerifyException e) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-17 13:53:14 UTC (rev 
7868)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-17 14:11:10 UTC (rev 
7869)
@@ -20,10 +20,10 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 358;
+       public static final int buildNumber = 359;

        /** Oldest build of Fred we will talk to */
-       public static final int lastGoodBuild = 358;
+       public static final int lastGoodBuild = 359;

        /** The highest reported build of fred */
        public static int highestSeenBuild = buildNumber;