verson 0.2 LGPL licensed source and jars

[vamsas.git] / src / uk / ac / vamsas / client / simpleclient / FileLock.java

diff --git a/src/uk/ac/vamsas/client/simpleclient/FileLock.java b/src/uk/ac/vamsas/client/simpleclient/FileLock.java
index b5ddbf3..cc5f0c9 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/FileLock.java
+++ b/src/uk/ac/vamsas/client/simpleclient/FileLock.java
@@ -1,6 +1,6 @@
 /*\r
- * This file is part of the Vamsas Client version 0.1. \r
- * Copyright 2009 by Jim Procter, Iain Milne, Pierre Marguerite, \r
+ * This file is part of the Vamsas Client version 0.2. \r
+ * Copyright 2010 by Jim Procter, Iain Milne, Pierre Marguerite, \r
  *  Andrew Waterhouse and Dominik Lindner.\r
  * \r
  * Earlier versions have also been incorporated into Jalview version 2.4 \r
@@ -77,9 +77,15 @@ public class FileLock extends Lock {
   private void tidy() {\r
     if (_lock != null) {\r
       if (advisory != null) {\r
+        File tgt = advisory.target;\r
         // TODO: fix occasional exceptions raised here (usually on JVM shutdown)\r
-        if (advisory.target != null) {\r
-          advisory.target.deleteOnExit(); // release will null the target\r
+        if (tgt != null) {\r
+          try {\r
+            tgt.deleteOnExit(); // release will null the target\r
+          } catch (NullPointerException e)\r
+          {\r
+            // ignore - TODO: fix nulls \r
+          }\r
         }\r
         advisory.release(true);\r
       }\r