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

[t...@freenetproject.org]

Author: toad
Date: 2006-01-26 16:27:13 +0000 (Thu, 26 Jan 2006)
New Revision: 7934

Modified:
   trunk/freenet/src/freenet/client/PutWaiter.java
   trunk/freenet/src/freenet/node/Version.java
Log:
385:
Fix NPE.

Modified: trunk/freenet/src/freenet/client/PutWaiter.java
===================================================================
--- trunk/freenet/src/freenet/client/PutWaiter.java     2006-01-26 00:45:42 UTC 
(rev 7933)
+++ trunk/freenet/src/freenet/client/PutWaiter.java     2006-01-26 16:27:13 UTC 
(rev 7934)
@@ -50,8 +50,10 @@
                                // Ignore
                        }
                }
-               error.uri = uri;
-               if(error != null) throw error;
+               if(error != null) {
+                       error.uri = uri;
+                       throw error;
+               }
                if(succeeded) return uri;
                Logger.error(this, "Did not succeed but no error");
                throw new InserterException(InserterException.INTERNAL_ERROR, 
"Did not succeed but no error", uri);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-26 00:45:42 UTC (rev 
7933)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-26 16:27:13 UTC (rev 
7934)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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