Author: toad
Date: 2008-06-26 23:42:44 +0000 (Thu, 26 Jun 2008)
New Revision: 20804
Modified:
branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
Log:
More queue page related FCPClient activation.
I should have added ObjectContainer to getURI in the previous commit.
Modified: branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
2008-06-26 23:36:47 UTC (rev 20803)
+++ branches/db4o/freenet/src/freenet/clients/http/QueueToadlet.java
2008-06-26 23:42:44 UTC (rev 20804)
@@ -924,9 +924,9 @@
return persistenceCell;
}
- private HTMLNode createDownloadCell(PageMaker pageMaker, ClientGet p) {
+ private HTMLNode createDownloadCell(PageMaker pageMaker, ClientGet p,
ObjectContainer container) {
HTMLNode downloadCell = new HTMLNode("td", "class",
"request-download");
- downloadCell.addChild("a", "href", p.getURI().toString(),
L10n.getString("QueueToadlet.download"));
+ downloadCell.addChild("a", "href",
p.getURI(container).toString(), L10n.getString("QueueToadlet.download"));
return downloadCell;
}
@@ -1033,11 +1033,11 @@
int column = columns[columnIndex];
if (column == LIST_IDENTIFIER) {
if (clientRequest instanceof ClientGet)
{
-
requestRow.addChild(createIdentifierCell(((ClientGet) clientRequest).getURI(),
clientRequest.getIdentifier(), false));
+
requestRow.addChild(createIdentifierCell(((ClientGet)
clientRequest).getURI(container), clientRequest.getIdentifier(), false));
} else if (clientRequest instanceof
ClientPutDir) {
-
requestRow.addChild(createIdentifierCell(((ClientPutDir)
clientRequest).getFinalURI(), clientRequest.getIdentifier(), true));
+
requestRow.addChild(createIdentifierCell(((ClientPutDir)
clientRequest).getFinalURI(container), clientRequest.getIdentifier(), true));
} else if (clientRequest instanceof
ClientPut) {
-
requestRow.addChild(createIdentifierCell(((ClientPut)
clientRequest).getFinalURI(), clientRequest.getIdentifier(), false));
+
requestRow.addChild(createIdentifierCell(((ClientPut)
clientRequest).getFinalURI(container), clientRequest.getIdentifier(), false));
}
} else if (column == LIST_SIZE) {
if (clientRequest instanceof ClientGet)
{
@@ -1046,7 +1046,7 @@
requestRow.addChild(createSizeCell(((ClientPut) clientRequest).getDataSize(),
true, advancedModeEnabled));
}
} else if (column == LIST_DOWNLOAD) {
-
requestRow.addChild(createDownloadCell(pageMaker, (ClientGet) clientRequest));
+
requestRow.addChild(createDownloadCell(pageMaker, (ClientGet) clientRequest,
container));
} else if (column == LIST_MIME_TYPE) {
if (clientRequest instanceof ClientGet)
{
requestRow.addChild(createTypeCell(((ClientGet)
clientRequest).getMIMEType(container)));
@@ -1057,11 +1057,11 @@
requestRow.addChild(createPersistenceCell(clientRequest.isPersistent(),
clientRequest.isPersistentForever()));
} else if (column == LIST_KEY) {
if (clientRequest instanceof ClientGet)
{
-
requestRow.addChild(createKeyCell(((ClientGet) clientRequest).getURI(), false));
+
requestRow.addChild(createKeyCell(((ClientGet)
clientRequest).getURI(container), false));
} else if (clientRequest instanceof
ClientPut) {
-
requestRow.addChild(createKeyCell(((ClientPut) clientRequest).getFinalURI(),
false));
+
requestRow.addChild(createKeyCell(((ClientPut)
clientRequest).getFinalURI(container), false));
}else {
-
requestRow.addChild(createKeyCell(((ClientPutDir) clientRequest).getFinalURI(),
true));
+
requestRow.addChild(createKeyCell(((ClientPutDir)
clientRequest).getFinalURI(container), true));
}
} else if (column == LIST_FILENAME) {
if (clientRequest instanceof ClientGet)
{
@@ -1239,7 +1239,7 @@
return;
}
if(req instanceof ClientGet) {
- FreenetURI uri = ((ClientGet)req).getURI();
+ FreenetURI uri = ((ClientGet)req).getURI(container);
if(req.isPersistentForever() && uri != null)
container.activate(uri, 5);
long size = ((ClientGet)req).getDataSize(container);
@@ -1269,7 +1269,7 @@
alertsByIdentifier.put(identifier, alert);
}
} else if(req instanceof ClientPut) {
- FreenetURI uri = ((ClientPut)req).getFinalURI();
+ FreenetURI uri =
((ClientPut)req).getFinalURI(container);
if(req.isPersistentForever() && uri != null)
container.activate(uri, 5);
long size = ((ClientPut)req).getDataSize();
@@ -1303,7 +1303,7 @@
alertsByIdentifier.put(identifier, alert);
}
} else if(req instanceof ClientPutDir) {
- FreenetURI uri = ((ClientPutDir)req).getFinalURI();
+ FreenetURI uri =
((ClientPutDir)req).getFinalURI(container);
long size = ((ClientPutDir)req).getTotalDataSize();
int files = ((ClientPutDir)req).getNumberOfFiles();
String name = uri.getPreferredFilename();
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-26
23:36:47 UTC (rev 20803)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientGet.java 2008-06-26
23:42:44 UTC (rev 20804)
@@ -675,7 +675,9 @@
return this.returnType == ClientGetMessage.RETURN_TYPE_DISK;
}
- public FreenetURI getURI() {
+ public FreenetURI getURI(ObjectContainer container) {
+ if(persistenceType == PERSIST_FOREVER)
+ container.activate(uri, 5);
return uri;
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-06-26
23:36:47 UTC (rev 20803)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPut.java 2008-06-26
23:42:44 UTC (rev 20804)
@@ -447,7 +447,9 @@
return succeeded;
}
- public FreenetURI getFinalURI() {
+ public FreenetURI getFinalURI(ObjectContainer container) {
+ if(persistenceType == PERSIST_FOREVER)
+ container.activate(generatedURI, 5);
return generatedURI;
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-26 23:36:47 UTC (rev 20803)
+++ branches/db4o/freenet/src/freenet/node/fcp/ClientPutDir.java
2008-06-26 23:42:44 UTC (rev 20804)
@@ -329,7 +329,9 @@
return succeeded;
}
- public FreenetURI getFinalURI() {
+ public FreenetURI getFinalURI(ObjectContainer container) {
+ if(persistenceType == PERSIST_FOREVER)
+ container.activate(uri, 5);
return generatedURI;
}
Modified: branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java
===================================================================
--- branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2008-06-26
23:36:47 UTC (rev 20803)
+++ branches/db4o/freenet/src/freenet/node/fcp/FCPClient.java 2008-06-26
23:42:44 UTC (rev 20804)
@@ -404,7 +404,7 @@
// FIXME speed this up with another hashmap or something.
for(int i=0;i<completedUnackedRequests.size();i++) {
ClientGet getter = (ClientGet)
completedUnackedRequests.get(i);
- if(getter.getURI().equals(key)) {
+ if(getter.getURI(container).equals(key)) {
if(persistenceType ==
ClientRequest.PERSIST_FOREVER)
container.activate(getter, 1);
return getter;
