X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fuk%2Fac%2Fvamsas%2Fclient%2Fsimpleclient%2FFileLock.java;h=cc5f0c9af270b68502eaebef8d2adaa67cfe6c53;hb=1eea4b639911330e7cd65e17c5421cc584f0d22e;hp=b5ddbf301874fb3ab90f701d227bae6e4f6ae05a;hpb=844ccad5a3fcbedec17b2af66d460f31abc7cff1;p=vamsas.git

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