Changeset 6656

Timestamp:

2004-01-29T14:30:11+13:00 (20 years ago)

Author:

jmt12

Message:

Unfortunately my quick-fix to the WGet not updating FileNodes problem doesn't work. It in fact causes several NPE's when attempting to copy files regularily - the problem being that the getNode() method calls unmap() on a different thread than that which calls map(), and so you often get both at the same time. More-over at east one of the thread is from the AWT Event thread so placing synchronization other the two problematic methods causes GUI deadlock. Solution - remove unmap() from getNode(). Result - WGet won't properly update workspace.

File:

• trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java (modified) (2 diffs)

trunk/gli/src/org/greenstone/gatherer/file/FileSystemModel.java

@@ -69 +69 @@
         Gatherer.print("Searching for '" + stale_object + "': ");
         // Locate the fresh node by searching current's children. Remember to ensure that current is mapped.
-        current.unmap();
+        //current.unmap();
         boolean found = false;
 
@@ -99 +99 @@
             Gatherer.println("Not Found!");
         }
+        else {
+            Gatherer.println("Returning node: " + new TreePath(current.getPath()));
+        }
         // Repeat as necessary
         }
     }
-    Gatherer.println("Returning node: " + new TreePath(current.getPath()));
     return current;
     }