Author: toad
Date: 2007-08-31 15:06:37 +0000 (Fri, 31 Aug 2007)
New Revision: 14937
Modified:
trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
don't check cancelled, only check isFinished() (it's more general anyway)
Modified: trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2007-08-31 15:05:17 UTC (rev 14936)
+++ trunk/freenet/src/freenet/client/async/SimpleManifestPutter.java
2007-08-31 15:06:37 UTC (rev 14937)
@@ -242,11 +242,7 @@
if(logMINOR) Logger.minor(this, "Starting "+this);
PutHandler[] running;
- boolean cancel = false;
-
synchronized(this) {
- cancel = cancelled;
- if(!cancelled) {
running = (PutHandler[])
runningPutHandlers.toArray(new PutHandler[runningPutHandlers.size()]);
try {
for(int i=0;i<running.length;i++) {
@@ -260,7 +256,6 @@
}
}
if(logMINOR) Logger.minor(this,
"Started "+running.length+" PutHandler's for "+this);
- if(cancelled) cancel();
if(running.length == 0) {
insertedAllFiles = true;
gotAllMetadata();
@@ -269,9 +264,7 @@
cancelAndFinish();
throw e;
}
- }
}
- if(cancel) cancel();
}
private void makePutHandlers(HashMap manifestElements, HashMap
putHandlersByName) throws InsertException {
