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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-12-15 01:38:56 +0000 (Sat, 15 Dec 2007)
New Revision: 16561

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
Log:
Should fix DDA (need testing)

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-12-15 01:29:35 UTC 
(rev 16560)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-12-15 01:38:56 UTC 
(rev 16561)
@@ -259,18 +259,6 @@
                                || 
queueManager.getQueryManager().getConnection() == null)
                        return false;

-               if 
(queueManager.getQueryManager().getConnection().isLocalSocket()
-                   && !noDDA
-                   && (destinationDir != null || finalPath != null)) {
-
-                       if (destinationDir == null)
-                               destinationDir = new 
File(finalPath).getAbsoluteFile().getParent();
-
-                       testDDA = new FCPTestDDA(destinationDir, false, true);
-                       testDDA.addObserver(this);
-                       return testDDA.start(queueManager);
-               }
-
                return sendClientGet();
        }

@@ -417,7 +405,21 @@

                if("ProtocolError".equals( message.getMessageName() )) {
                        Logger.debug(this, "ProtocolError !");
+                       
+                       if 
(queueManager.getQueryManager().getConnection().isLocalSocket()
+                                       && !noDDA
+                                   && (destinationDir != null || finalPath != 
null)) {

+                                       if (destinationDir == null)
+                                               destinationDir = new 
File(finalPath).getAbsoluteFile().getParent();
+
+                               testDDA = new FCPTestDDA(destinationDir, false, 
true);
+                               testDDA.addObserver(this);
+                               testDDA.start(queueManager);
+                               
+                               return;
+                       }
+
                        if ("4".equals(message.getValue("Code"))) {
                                Logger.warning(this, "The node reported an 
invalid key. Please check the following key\n"+
                                               key);