r26835 - in trunk/freenet/src/freenet: clients/http node/fcp

Author: toad
Date: 2009-04-15 10:14:52 +0000 (Wed, 15 Apr 2009)
New Revision: 26835

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
   trunk/freenet/src/freenet/node/fcp/ClientGet.java
   trunk/freenet/src/freenet/node/fcp/ClientPut.java
Log:
Fix filenames not showing up


Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java	2009-04-15 10:06:57 UTC (rev 26834)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java	2009-04-15 10:14:52 UTC (rev 26835)
@@ -1318,9 +1318,9 @@
 					}
 				} else if (column == LIST_FILENAME) {
 					if (clientRequest instanceof ClientGet) {
-						requestRow.addChild(createFilenameCell(((ClientGet) clientRequest).getDestFilename()));
+						requestRow.addChild(createFilenameCell(((ClientGet) clientRequest).getDestFilename(container)));
 					} else if (clientRequest instanceof ClientPut) {
-						requestRow.addChild(createFilenameCell(((ClientPut) clientRequest).getOrigFilename()));
+						requestRow.addChild(createFilenameCell(((ClientPut) clientRequest).getOrigFilename(container)));
 					}
 				} else if (column == LIST_PRIORITY) {
 					requestRow.addChild(createPriorityCell(pageMaker, clientRequest.getIdentifier(), clientRequest.getPriority(), ctx, priorityClasses, advancedModeEnabled));

Modified: trunk/freenet/src/freenet/node/fcp/ClientGet.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGet.java	2009-04-15 10:06:57 UTC (rev 26834)
+++ trunk/freenet/src/freenet/node/fcp/ClientGet.java	2009-04-15 10:14:52 UTC (rev 26835)
@@ -792,7 +792,9 @@
 		return null;
 	}
 
-	public File getDestFilename() {
+	public File getDestFilename(ObjectContainer container) {
+		if(persistenceType == PERSIST_FOREVER)
+			container.activate(targetFile, 5);
 		return targetFile;
 	}
 

Modified: trunk/freenet/src/freenet/node/fcp/ClientPut.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPut.java	2009-04-15 10:06:57 UTC (rev 26834)
+++ trunk/freenet/src/freenet/node/fcp/ClientPut.java	2009-04-15 10:14:52 UTC (rev 26835)
@@ -440,9 +440,11 @@
 		return uploadFrom == ClientPutMessage.UPLOAD_FROM_DIRECT;
 	}
 
-	public File getOrigFilename() {
+	public File getOrigFilename(ObjectContainer container) {
 		if(uploadFrom != ClientPutMessage.UPLOAD_FROM_DISK)
 			return null;
+		if(persistenceType == PERSIST_FOREVER)
+			container.activate(origFilename, 5);
 		return origFilename;
 	}