[freenet-cvs] r8151 - in trunk/freenet/src/freenet: client/async node

[t...@freenetproject.org]

Author: toad
Date: 2006-03-03 23:49:45 +0000 (Fri, 03 Mar 2006)
New Revision: 8151

Modified:
   trunk/freenet/src/freenet/client/async/ClientGetter.java
   trunk/freenet/src/freenet/node/Version.java
Log:
488:
Fix NPE.

Modified: trunk/freenet/src/freenet/client/async/ClientGetter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientGetter.java    2006-03-03 
21:38:55 UTC (rev 8150)
+++ trunk/freenet/src/freenet/client/async/ClientGetter.java    2006-03-03 
23:49:45 UTC (rev 8151)
@@ -64,7 +64,7 @@
        public void onSuccess(FetchResult result, ClientGetState state) {
                finished = true;
                currentState = null;
-               if(result.asBucket() != returnBucket) {
+               if(returnBucket != null && result.asBucket() != returnBucket) {
                        Bucket from = result.asBucket();
                        Bucket to = returnBucket;
                        try {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-03-03 21:38:55 UTC (rev 
8150)
+++ trunk/freenet/src/freenet/node/Version.java 2006-03-03 23:49:45 UTC (rev 
8151)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       private static final int buildNumber = 487;
+       private static final int buildNumber = 488;

        /** Oldest build of Fred we will talk to */
        private static final int lastGoodBuild = 475;