[freenet-cvs] r13321 - trunk/freenet/src/freenet/client/async

[t...@freenetproject.org]

Author: toad
Date: 2007-05-22 22:02:57 +0000 (Tue, 22 May 2007)
New Revision: 13321

Modified:
   trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Don't loop forever on getting an InsertException while resolving.
Don't hold the lock while calling getAllMetadata().

Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2007-05-22 21:45:00 UTC (rev 13320)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java    
2007-05-22 22:02:57 UTC (rev 13321)
@@ -125,8 +125,8 @@
                        synchronized(SimpleManifestPutter.this) {
                                putHandlersWaitingForMetadata.remove(this);
                                if(!putHandlersWaitingForMetadata.isEmpty()) 
return;
-                               gotAllMetadata();
                        }
+                       gotAllMetadata();
                }

                public void addBlock() {
@@ -381,6 +381,7 @@
                                        return;
                                } catch (InsertException e2) {
                                        fail(e2);
+                                       return;
                                }
                        }
                }