Changeset 17773

Timestamp:

2008-11-06T20:37:15+13:00 (15 years ago)

Author:

ak19

Message:

Fixed bug I introduced in recent changes to Download panel which caused an infinite exception to be thrown (thread problem) if you viewed the log for a different download job's URL after having viewed the log for a previous download job's URL.

File:

• gli/trunk/src/org/greenstone/gatherer/download/DownloadScrollPane.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/download/DownloadScrollPane.java

@@ -93 +93 @@
         }
         
-        job = null;
+        setJobToNull();//job = null;
         
     }
@@ -99 +99 @@
     finishedDownloadJob(delete_me);
     }
+
+    synchronized protected void setJobToNull() { job = null; }  
 
     /** To be called when a download job has terminated naturally or was prematurely stopped
@@ -213 +215 @@
             DebugStream.println("DownloadJob " + jobDisplayString + " Begun.");
             System.err.println("DownloadJob " + job.port + " " + job.toString() + " Begun.");
-            job.callDownload();
+            if(job != null) {
+                job.callDownload();
+            }
             finishedDownloadJob(delete_me); // Job is done, get rid of the separate display panel for this download
             System.err.println("DownloadJob " + jobDisplayString + " complete.");