X-Git-Url: http://source.jalview.org/gitweb/?p=vamsas.git;a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fclient%2Fsimpleclient%2FFileLock.java;h=920170265e696d6e622c05ebb8ca9a81dd2bbbd0;hp=c069d9593e4da20c02b6ae1b0c2e662d21c9864b;hb=f69cbcaf96076a079dac381630cfd9734c31d114;hpb=9d9b664b45909d1f3a718b0edb9119d0afa88baa

diff --git a/src/uk/ac/vamsas/client/simpleclient/FileLock.java b/src/uk/ac/vamsas/client/simpleclient/FileLock.java
index c069d95..9201702 100644
--- a/src/uk/ac/vamsas/client/simpleclient/FileLock.java
+++ b/src/uk/ac/vamsas/client/simpleclient/FileLock.java
@@ -40,7 +40,7 @@ public class FileLock extends Lock {
         throw new Error("Failed to create advisory lock file "+_lock);
       }
     }
-    return advisory.isLocked();
+    return (advisory!=null) && advisory.isLocked();
   }
   /**
    * call to clear up a filelock file after its been made
@@ -49,8 +49,8 @@ public class FileLock extends Lock {
   private void tidy() {
     if (_lock!=null) { 
       if ( advisory!=null) {
+        advisory.target.deleteOnExit(); // release will null the target
         advisory.release(true);
-        advisory.target.deleteOnExit();
       }
       advisory=null;
       _lock=null;