Changeset 22807 for main/trunk/gli/src/org/greenstone/gatherer/util/AppendLineOnlyFileDocument.java

Timestamp:

2010-08-30T19:32:02+12:00 (14 years ago)

Author:

ak19

Message:

Fixed a bug in GLI where we weren't able to delete a collection just built (even without any docs in it) and which had just been closed. The reason was that the build_log file was never properly closed until a new collection was opened, at which point we could finally delete the previously closed collection. Now on CollectionManager.closeCollection(), GLI ensures that any currently active build_log in OptionsPane is closed (which calls the new close method in AppendLineOnlyFileDocument.

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/AppendLineOnlyFileDocument.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/util/AppendLineOnlyFileDocument.java

@@ -172 +172 @@
     }
 
+    /** ensure the current build_log file has finished transferring from memory to disk, and that the random access
+    * file is properly closed when a collection is closed.  Else we can't delete the just-closed collection since the 
+    * build_log file resource is still kept open. */
+    public void close() {
+        if(writer == null) { // closed already
+            return;
+        }
+        // get rid of the writer and then close the file
+        setExit();
+        writer = null;
+        try {   
+            file.close();
+        } catch(Exception exception) {
+            DebugStream.println("Exception in AppendLineOnlyFileDocument.close() - Unable to close internal file");
+            DebugStream.printStackTrace(exception);
+        }
+    }
+    
     /** The destructor is implemented to ensure the current log file has finished transferring from memory to disk, and that the random access file is properly closed, before GLI exits.
      * @see org.greenstone.gatherer.util.AppendLineOnlyFileDocument.WriterThread#finish
@@ -177 +195 @@
     public void destroy() {
     try {
-        writer.finish();
-        file.close();
+        if(writer != null) {
+            writer.finish();
+            writer = null;
+            file.close();
+        }
     }
     catch(Exception exception) {