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

[t...@freenetproject.org]

Author: toad
Date: 2006-05-24 21:58:12 +0000 (Wed, 24 May 2006)
New Revision: 8859

Modified:
   trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
   trunk/freenet/src/freenet/node/Version.java
   trunk/freenet/src/freenet/node/fcp/ClientPutDir.java
   trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
Log:
738: Fix #375? Certainly fix a hang when putting freesites with no non-ZIPpable 
files.

Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2006-05-24 21:53:50 UTC (rev 8858)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2006-05-24 21:58:12 UTC (rev 8859)
@@ -223,6 +223,7 @@
        }

        public void start() throws InserterException {
+               Logger.minor(this, "Starting "+this);
                PutHandler[] running;
                synchronized(this) {
                        running = (PutHandler[]) runningPutHandlers.toArray(new 
PutHandler[runningPutHandlers.size()]);
@@ -232,6 +233,9 @@
                        for(int i=0;i<running.length;i++) {
                                running[i].start();
                        }
+                       Logger.minor(this, "Started "+running.length+" 
PutHandler's for "+this);
+                       if(running.length == 0)
+                               gotAllMetadata();
                } catch (InserterException e) {
                        cancelAndFinish();
                        throw e;

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-05-24 21:53:50 UTC (rev 
8858)
+++ trunk/freenet/src/freenet/node/Version.java 2006-05-24 21:58:12 UTC (rev 
8859)
@@ -18,7 +18,7 @@
        public static final String protocolVersion = "1.0";

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

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

Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDir.java        2006-05-24 
21:53:50 UTC (rev 8858)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDir.java        2006-05-24 
21:58:12 UTC (rev 8859)
@@ -135,6 +135,7 @@
                try {
                        if(putter != null)
                                putter.start();
+                       Logger.minor(this, "Started "+putter);
                } catch (InserterException e) {
                        onFailure(e, null);
                }

Modified: trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java        
2006-05-24 21:53:50 UTC (rev 8858)
+++ trunk/freenet/src/freenet/node/fcp/FCPConnectionHandler.java        
2006-05-24 21:58:12 UTC (rev 8859)
@@ -171,6 +171,7 @@
        }

        public void startClientPutDir(ClientPutDirMessage message, HashMap 
buckets) {
+               Logger.minor(this, "Start ClientPutDir");
                String id = message.identifier;
                ClientPutDir cp = null;
                boolean success;
@@ -204,6 +205,7 @@
                                if(cp.isPersistentForever())
                                        server.forceStorePersistentRequests();
                        }
+                       Logger.minor(this, "Starting "+cp);
                        cp.start();
                }
        }