[freenet-cvs] r17115 - trunk/freenet/src/freenet/clients/http

[t...@freenetproject.org]

Author: toad
Date: 2008-01-17 22:36:30 +0000 (Thu, 17 Jan 2008)
New Revision: 17115

Modified:
   trunk/freenet/src/freenet/clients/http/QueueToadlet.java
Log:
No targetfilename if not CHK

Modified: trunk/freenet/src/freenet/clients/http/QueueToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2008-01-17 
22:30:25 UTC (rev 17114)
+++ trunk/freenet/src/freenet/clients/http/QueueToadlet.java    2008-01-17 
22:36:30 UTC (rev 17115)
@@ -267,6 +267,9 @@
                                String contentType = 
DefaultMIMETypes.guessMIMEType(filename, false);
                                FreenetURI furi = new FreenetURI("CHK@");
                                String key = request.getPartAsString("key", 
128);
+                               String target = file.getName();
+                               if(!furi.getKeyType().equals("chk"))
+                                       target = null;
                                if(key != null) {
                                        try {
                                                furi = new FreenetURI(key);
@@ -276,7 +279,7 @@
                                        }
                                }
                                try {
-                                       ClientPut clientPut = new 
ClientPut(fcp.getGlobalClient(), furi, identifier, Integer.MAX_VALUE, 
RequestStarter.BULK_SPLITFILE_PRIORITY_CLASS, ClientRequest.PERSIST_FOREVER, 
null, false, false, -1, ClientPutMessage.UPLOAD_FROM_DISK, file, contentType, 
new FileBucket(file, true, false, false, false, false), null, file.getName(), 
false);
+                                       ClientPut clientPut = new 
ClientPut(fcp.getGlobalClient(), furi, identifier, Integer.MAX_VALUE, 
RequestStarter.BULK_SPLITFILE_PRIORITY_CLASS, ClientRequest.PERSIST_FOREVER, 
null, false, false, -1, ClientPutMessage.UPLOAD_FROM_DISK, file, contentType, 
new FileBucket(file, true, false, false, false, false), null, target, false);
                                        if(logMINOR) Logger.minor(this, 
"Started global request to insert "+file+" to CHK@ as "+identifier);
                                        clientPut.start();
                                        fcp.forceStorePersistentRequests();