Author: toad
Date: 2009-03-24 23:41:49 +0000 (Tue, 24 Mar 2009)
New Revision: 26171
Modified:
branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
Log:
Add container to args for getDataSize, use it for activation
Modified: branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
2009-03-24 23:41:10 UTC (rev 26170)
+++ branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
2009-03-24 23:41:49 UTC (rev 26171)
@@ -644,7 +644,7 @@
lowestQueuedPrio = prio;
uncompletedUpload.add(cp);
}
- long size = cp.getDataSize();
+ long size = cp.getDataSize(container);
if(size > 0)
totalQueuedUploadSize += size;
} else if(req instanceof ClientPutDir) {
@@ -1196,7 +1196,7 @@
if (clientRequest instanceof ClientGet)
{
requestRow.addChild(createSizeCell(((ClientGet)
clientRequest).getDataSize(container), ((ClientGet)
clientRequest).isTotalFinalized(container), advancedModeEnabled));
} else if (clientRequest instanceof
ClientPut) {
-
requestRow.addChild(createSizeCell(((ClientPut) clientRequest).getDataSize(),
true, advancedModeEnabled));
+
requestRow.addChild(createSizeCell(((ClientPut)
clientRequest).getDataSize(container), true, advancedModeEnabled));
}
} else if (column == LIST_DOWNLOAD) {
requestRow.addChild(createDownloadCell(pageMaker, (ClientGet) clientRequest,
container));
@@ -1432,7 +1432,7 @@
Logger.error(this, "No URI for supposedly
finished request "+req);
return;
}
- long size = ((ClientPut)req).getDataSize();
+ long size = ((ClientPut)req).getDataSize(container);
String name = uri.getPreferredFilename();
String title = l10n("uploadSucceededTitle", "filename",
name);
HTMLNode text = new HTMLNode("div");
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2009-03-24
23:41:10 UTC (rev 26170)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2009-03-24
23:41:49 UTC (rev 26171)
@@ -446,7 +446,7 @@
}
return new PersistentPut(identifier, publicURI, verbosity,
priorityClass, uploadFrom, targetURI,
persistenceType, origFilename,
clientMetadata.getMIMEType(), client.isGlobalQueue,
- getDataSize(), clientToken, started,
ctx.maxInsertRetries, targetFilename, binaryBlob);
+ getDataSize(container), clientToken, started,
ctx.maxInsertRetries, targetFilename, binaryBlob);
}
@Override
@@ -475,11 +475,13 @@
return origFilename;
}
- public long getDataSize() {
+ public long getDataSize(ObjectContainer container) {
if(data == null)
return finishedSize;
- else
+ else {
+ container.activate(data, 1);
return data.size();
+ }
}
public String getMIMEType() {
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
