[Thaw-dev] r14001 - trunk/apps/Thaw/src/thaw/fcp

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-07-09 10:42:30 +0000 (Mon, 09 Jul 2007)
New Revision: 14001

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
Log:
Add another fix because of frost files

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-07-09 09:55:18 UTC 
(rev 14000)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-07-09 10:42:30 UTC 
(rev 14001)
@@ -260,7 +260,7 @@
                final FCPMessage queryMessage = new FCPMessage();

                queryMessage.setMessageName("ClientGet");
-               queryMessage.setValue("URI", getFileKey());
+               queryMessage.setValue("URI", key);
                queryMessage.setValue("Identifier", identifier);
                queryMessage.setValue("Verbosity", "1");
                queryMessage.setValue("MaxRetries", 
Integer.toString(maxRetries));
@@ -955,6 +955,15 @@
        }

        public String getFileKey() {
+               // TODO : It's fix due to Frost
+               //        => to remove when it will become unneeded
+
+               if (filename != null && key != null
+                   && key.startsWith("CHK@")
+                   && key.indexOf('/') < 0) {
+                       return key + "/" + filename;
+               }
+
                return key;
        }