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

[t...@freenetproject.org]

Author: toad
Date: 2006-05-25 15:27:32 +0000 (Thu, 25 May 2006)
New Revision: 8869

Modified:
   trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
   trunk/freenet/src/freenet/node/PacketSender.java
   trunk/freenet/src/freenet/node/Version.java
Log:
739: Fix another insert bug (it would reach 100% and never complete), when 
everything fits in the ZIP.

Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2006-05-25 13:47:14 UTC (rev 8868)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2006-05-25 15:27:32 UTC (rev 8869)
@@ -8,6 +8,7 @@
 import java.util.LinkedList;
 import java.util.Vector;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipException;
 import java.util.zip.ZipOutputStream;

 import freenet.client.ClientMetadata;
@@ -234,8 +235,10 @@
                                running[i].start();
                        }
                        Logger.minor(this, "Started "+running.length+" 
PutHandler's for "+this);
-                       if(running.length == 0)
+                       if(running.length == 0) {
+                               insertedAllFiles = true;
                                gotAllMetadata();
+                       }
                } catch (InserterException e) {
                        cancelAndFinish();
                        throw e;
@@ -406,6 +409,9 @@
                                block = new InsertBlock(zipBucket, new 
ClientMetadata("application/zip"), targetURI);
                                isMetadata = false;
                                insertAsArchiveManifest = true;
+                       } catch (ZipException e) {
+                               fail(new 
InserterException(InserterException.INTERNAL_ERROR, e, null));
+                               return;
                        } catch (IOException e) {
                                fail(new 
InserterException(InserterException.BUCKET_ERROR, e, null));
                                return;

Modified: trunk/freenet/src/freenet/node/PacketSender.java
===================================================================
--- trunk/freenet/src/freenet/node/PacketSender.java    2006-05-25 13:47:14 UTC 
(rev 8868)
+++ trunk/freenet/src/freenet/node/PacketSender.java    2006-05-25 15:27:32 UTC 
(rev 8869)
@@ -84,6 +84,8 @@

                 // Any urgent notifications to send?
                 long urgentTime = pn.getNextUrgentTime();
+                // Should spam the logs, unless there is a deadlock
+                Logger.minor(this, "Next urgent time: "+urgentTime+" for 
"+pn.getDetectedPeer());
                 if(urgentTime <= now) {
                     // Send them
                     try {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-25 13:47:14 UTC (rev 
8868)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-25 15:27:32 UTC (rev 
8869)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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