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

[jfle...@freenetproject.org]

Author: jflesch
Date: 2007-04-21 13:55:28 +0000 (Sat, 21 Apr 2007)
New Revision: 12839

Modified:
   trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
   trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
Log:
Fix thaw global queue management : Don't lock the socket when getting the 
transfer list, we may have a redirection + remove the failed download if there 
is a redirection

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-04-21 12:12:05 UTC 
(rev 12838)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPClientGet.java      2007-04-21 13:55:28 UTC 
(rev 12839)
@@ -12,7 +12,7 @@
 public class FCPClientGet extends Observable implements Observer, 
FCPTransferQuery {
        private int maxRetries = -1;
        private final static int PACKET_SIZE = 1024;
-       private final static int BLOCK_SIZE = 32768;
+       private final static int BLOCK_SIZE = 16384;

        private FCPQueueManager queueManager;
        private FCPQueryManager duplicatedQueryManager;
@@ -400,6 +400,7 @@
                                Logger.debug(this, "Redirected !");
                                key = message.getValue("RedirectURI");
                                status = "Redirected ...";
+                               stop(queueManager);
                                start(queueManager);
                                return;
                        }

Modified: trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java
===================================================================
--- trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java    2007-04-21 12:12:05 UTC 
(rev 12838)
+++ trunk/apps/Thaw/src/thaw/fcp/FCPQueueLoader.java    2007-04-21 13:55:28 UTC 
(rev 12839)
@@ -27,8 +27,8 @@
                final FCPListPersistentRequests listPersistent = new 
FCPListPersistentRequests();
                final boolean ret = listPersistent.start(queueManager);

-               if(ret)
-                       
queueManager.getQueryManager().getConnection().addToWriterQueue();
+               //if(ret)
+               //      
queueManager.getQueryManager().getConnection().addToWriterQueue();

                return ret;
        }
@@ -137,7 +137,7 @@

                if("EndListPersistentRequests".equals( msg.getMessageName() )) {
                        Logger.info(this, "End Of ListPersistentRequests.");
-                       
queueManager.getQueryManager().getConnection().removeFromWriterQueue();
+                       
//queueManager.getQueryManager().getConnection().removeFromWriterQueue();
                        queueManager.setQueueCompleted();
                        return;
                }