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

[t...@freenetproject.org]

Author: toad
Date: 2006-01-27 21:23:40 +0000 (Fri, 27 Jan 2006)
New Revision: 7958

Modified:
   trunk/freenet/src/freenet/client/FetchException.java
   trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
   trunk/freenet/src/freenet/node/Version.java
Log:
409:
Fix NPE :)
Also FetchException.isFatal update.

Modified: trunk/freenet/src/freenet/client/FetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchException.java        2006-01-27 
21:19:05 UTC (rev 7957)
+++ trunk/freenet/src/freenet/client/FetchException.java        2006-01-27 
21:23:40 UTC (rev 7958)
@@ -277,6 +277,7 @@
                case FetchException.TOO_MUCH_RECURSION:
                case FetchException.UNKNOWN_METADATA:
                case FetchException.UNKNOWN_SPLITFILE_METADATA:
+               case FetchException.INVALID_URI:
                case FetchException.TOO_BIG:
                        return true;


Modified: trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2006-01-27 21:19:05 UTC (rev 7957)
+++ trunk/freenet/src/freenet/client/async/SplitFileFetcherSegment.java 
2006-01-27 21:23:40 UTC (rev 7958)
@@ -163,10 +163,14 @@
                        if(startedDecode) return;
                        startedDecode = true;
                }
-               for(int i=0;i<dataBlockStatus.length;i++)
-                       dataBlockStatus[i].cancel();
-               for(int i=0;i<checkBlockStatus.length;i++)
-                       checkBlockStatus[i].cancel();
+               for(int i=0;i<dataBlockStatus.length;i++) {
+                       SingleFileFetcher f = dataBlockStatus[i];
+                       if(f != null) f.cancel();
+               }
+               for(int i=0;i<checkBlockStatus.length;i++) {
+                       SingleFileFetcher f = checkBlockStatus[i];
+                       if(f != null) f.cancel();
+               }
                Runnable r = new Decoder();
                Thread t = new Thread(r, "Decoder for "+this);
                t.setDaemon(true);

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-27 21:19:05 UTC (rev 
7957)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-27 21:23:40 UTC (rev 
7958)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

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

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