Author: toad
Date: 2008-06-06 12:27:48 +0000 (Fri, 06 Jun 2008)
New Revision: 20241
Modified:
branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
Log:
More minor fixes
Modified: branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2008-06-06 12:24:57 UTC (rev 20240)
+++ branches/db4o/freenet/src/freenet/client/async/ClientPutter.java
2008-06-06 12:27:48 UTC (rev 20241)
@@ -121,7 +121,7 @@
if(Logger.shouldLog(Logger.MINOR, this))
Logger.minor(this, "Starting insert:
"+currentState);
if(currentState instanceof SingleFileInserter)
-
((SingleFileInserter)currentState).start(oldProgress, container);
+
((SingleFileInserter)currentState).start(oldProgress, container, context);
else
currentState.schedule(container, context);
synchronized(this) {
Modified:
branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
===================================================================
--- branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-06-06 12:24:57 UTC (rev 20240)
+++ branches/db4o/freenet/src/freenet/client/async/SimpleManifestPutter.java
2008-06-06 12:27:48 UTC (rev 20241)
@@ -70,9 +70,9 @@
private String targetInZip;
private final Bucket data;
- public void start(ObjectContainer container) throws
InsertException {
+ public void start(ObjectContainer container, ClientContext
context) throws InsertException {
if((origSFI == null) && (metadata != null)) return;
- origSFI.start(null, container);
+ origSFI.start(null, container, context);
origSFI = null;
}
@@ -129,7 +129,7 @@
putHandlersWaitingForMetadata.remove(this);
if(!putHandlersWaitingForMetadata.isEmpty())
return;
}
- gotAllMetadata(container);
+ gotAllMetadata(container, context);
}
public void addBlock() {
@@ -239,7 +239,7 @@
// FIXME do something.
}
- public void start(ObjectContainer container) throws InsertException {
+ public void start(ObjectContainer container, ClientContext context)
throws InsertException {
logMINOR = Logger.shouldLog(Logger.MINOR, this);
if (logMINOR)
Logger.minor(this, "Starting " + this);
@@ -250,7 +250,7 @@
}
try {
for (int i = 0; i < running.length; i++) {
- running[i].start(container);
+ running[i].start(container, context);
if (logMINOR)
Logger.minor(this, "Started " + i + "
of " + running.length);
if (isFinished()) {
@@ -263,7 +263,7 @@
Logger.minor(this, "Started " + running.length
+ " PutHandler's for " + this);
if (running.length == 0) {
insertedAllFiles = true;
- gotAllMetadata(container);
+ gotAllMetadata(container, context);
}
} catch (InsertException e) {
cancelAndFinish();
@@ -339,7 +339,7 @@
return finished || cancelled;
}
- private void gotAllMetadata(ObjectContainer container) {
+ private void gotAllMetadata(ObjectContainer container, ClientContext
context) {
if(logMINOR) Logger.minor(this, "Got all metadata");
HashMap namesToByteArrays = new HashMap();
namesToByteArrays(putHandlersByName, namesToByteArrays);
@@ -362,11 +362,11 @@
}
baseMetadata =
Metadata.mkRedirectionManifestWithMetadata(namesToByteArrays);
- resolveAndStartBase(container);
+ resolveAndStartBase(container, context);
}
- private void resolveAndStartBase(ObjectContainer container) {
+ private void resolveAndStartBase(ObjectContainer container,
ClientContext context) {
Bucket bucket = null;
synchronized(this) {
if(hasResolvedBase) return;
@@ -380,7 +380,7 @@
return;
} catch (MetadataUnresolvedException e) {
try {
- resolve(e, container);
+ resolve(e, container, context);
} catch (IOException e1) {
fail(new
InsertException(InsertException.BUCKET_ERROR, e, null));
return;
@@ -456,13 +456,13 @@
if(logMINOR) Logger.minor(this, "Inserting main
metadata: "+metadataInserter);
this.metadataPuttersByMetadata.put(baseMetadata,
metadataInserter);
metadataPuttersUnfetchable.put(baseMetadata,
metadataInserter);
- metadataInserter.start(null, container);
+ metadataInserter.start(null, container, context);
} catch (InsertException e) {
fail(e);
}
}
- private boolean resolve(MetadataUnresolvedException e, ObjectContainer
container) throws InsertException, IOException {
+ private boolean resolve(MetadataUnresolvedException e, ObjectContainer
container, ClientContext context) throws InsertException, IOException {
Metadata[] metas = e.mustResolve;
boolean mustWait = false;
for(int i=0;i<metas.length;i++) {
@@ -482,9 +482,9 @@
synchronized(this) {
this.metadataPuttersByMetadata.put(m,
metadataInserter);
}
- metadataInserter.start(null, container);
+ metadataInserter.start(null, container,
context);
} catch (MetadataUnresolvedException e1) {
- resolve(e1, container);
+ resolve(e1, container, context);
}
}
return mustWait;
@@ -595,7 +595,7 @@
Metadata m = (Metadata) state.getToken();
m.resolve(key.getURI());
if(logMINOR) Logger.minor(this, "Resolved "+m+" :
"+key.getURI());
- resolveAndStartBase(container);
+ resolveAndStartBase(container, context);
}
}
