Changeset 11509

Timestamp:

2006-03-28T11:40:28+12:00 (18 years ago)

Author:

shaoqun

Message:

synchronize the job_queues in run method

File:

• trunk/gli/src/org/greenstone/gatherer/WGet.java (modified) (4 diffs)

trunk/gli/src/org/greenstone/gatherer/WGet.java

@@ -107 +107 @@
     }
 
-
     /** This method is called to delete a certain job from the queue.
      * This job may be pending, complete or even in progress. However
@@ -116 +115 @@
      */
     public void deleteDownloadJob(DownloadJob delete_me) {
+        
     if (delete_me == job) {
         // While this seems wasteful its only for the briefest moment.
@@ -263 +263 @@
     public void run() {
     while(true) {
+         
         // If there are jobs job_queue and we have more room.
         if(job_queue.size() > 0) {
         int index = 0;
         while(job_queue.size() > 0 && index < job_queue.size()) {
-            // Get the first job that isn't stopped.
-            job = (DownloadJob) job_queue.get(index);
-            if(job.getState() == DownloadJob.RUNNING) {
-            DebugStream.println("DownloadJob " + job.toString() + " Begun.");
-            // A lock to prevent us deleting this job while its being
+            // Get the first job that isn't stopped.       
+            synchronized(job_queue){
+            job = (DownloadJob) job_queue.get(index);
+            if(job.getState() == DownloadJob.RUNNING) {
+                DebugStream.println("DownloadJob " + job.toString() + " Begun.");
+                // A lock to prevent us deleting this job while its being
             // run, unless you want things to go really wrong.
-            busy = true;
-            if(simple) {
-                job.callWGet();
+                busy = true;
+                if(simple) {
+                job.callWGet();
+                }
+                else {
+                job.callWGetNative();
+                }
+                busy = false;
+                DebugStream.println("DownloadJob " + job.toString() + " complete.");
+                // And if the user has requested that complete jobs
+                // be removed, then remove it from the list.
+                //deleteDownloadJob(job);
+                job = null;
             }
-            else {
-                job.callWGetNative();
-            }
-            busy = false;
-            DebugStream.println("DownloadJob " + job.toString() + " complete.");
-            // And if the user has requested that complete jobs
-                // be removed, then remove it from the list.
-            //deleteDownloadJob(job);
-            job = null;
+            index++;
             }
-            index++;
         }
         }
@@ -303 +306 @@
         }
         }
+        
     } // End While.
     }