[Thaw-dev] r9633 - trunk/apps/Thaw/src/thaw/core

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-07-16 17:30:25 +0000 (Sun, 16 Jul 2006)
New Revision: 9633

Modified:
   trunk/apps/Thaw/src/thaw/core/QueueKeeper.java
Log:
Doesn't create thaw.queue.xml if not needed (== most of the time)

Modified: trunk/apps/Thaw/src/thaw/core/QueueKeeper.java
===================================================================
--- trunk/apps/Thaw/src/thaw/core/QueueKeeper.java      2006-07-16 16:48:34 UTC 
(rev 9632)
+++ trunk/apps/Thaw/src/thaw/core/QueueKeeper.java      2006-07-16 17:30:25 UTC 
(rev 9633)
@@ -179,9 +179,26 @@


        public static boolean saveQueue(FCPQueueManager queueManager, String 
fileName) {
-               Vector runningQueue = queueManager.getRunningQueue();
-               Vector[] pendingQueue = queueManager.getPendingQueues();
+               Vector[] pendingQueues = queueManager.getPendingQueues();
+               
+               boolean needed = false;

+               for(int i = 0 ; i < pendingQueues.length ; i++) {
+                       if(pendingQueues[i].size() > 0) {
+                               needed = true;
+                               break;
+                       }
+               }
+               
+               if(!needed) {
+                       Logger.info(new QueueKeeper(), "Nothing in the pending 
queue to save.");
+                       File file = new File(fileName);
+                       file.delete(); // Else we may reload something that we 
shouldn't when restarting
+                       return true;
+               }
+
+               
+
                File file = new File(fileName);
                StreamResult fileOut;

@@ -228,7 +245,7 @@

                for(int i = 0 ; i <= MIN_PRIORITY ; i++) {

-                       for(Iterator runIt = pendingQueue[i].iterator() ;
+                       for(Iterator runIt = pendingQueues[i].iterator() ;
                            runIt.hasNext(); ) {

                                FCPTransferQuery query = 
(FCPTransferQuery)runIt.next();