Author: toad
Date: 2009-02-26 18:22:20 +0000 (Thu, 26 Feb 2009)
New Revision: 25835
Modified:
trunk/freenet/
trunk/freenet/src/freenet/client/
trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
Merge 25355 from db4o branch (more or less!). Hopefully this and other changes
will help with bug 2486.
Property changes on: trunk/freenet
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25479,25488,25540,25594
+ /branches/db4o:25594
/branches/db4o/freenet:24785,25282,25290,25332,25351-25352,25355,25479,25488,25540,25594
Property changes on: trunk/freenet/src/freenet/client
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25479,25488,25540,25594
/branches/db4o/src/freenet/client:25594
+
/branches/db4o/freenet/src/freenet/client:24785,25282,25290,25332,25351-25353,25355,25479,25488,25540,25594
/branches/db4o/src/freenet/client:25594
Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-02-26 18:14:57 UTC (rev 25834)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2009-02-26 18:22:20 UTC (rev 25835)
@@ -136,11 +136,20 @@
return;
}
metadata = m;
+
+ boolean allMetadatas = false;
+
synchronized(SimpleManifestPutter.this) {
putHandlersWaitingForMetadata.remove(this);
- if(!putHandlersWaitingForMetadata.isEmpty())
return;
+ allMetadatas =
putHandlersWaitingForMetadata.isEmpty();
+ if(!allMetadatas) {
+ if(logMINOR)
+ Logger.minor(this, "Still
waiting for metadata: "+putHandlersWaitingForMetadata.size());
+ }
}
- gotAllMetadata();
+ if(allMetadatas) {
+ gotAllMetadata();
+ }
}
@Override
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
