made finalize check before zeroing self-references in SimpleClient (this is only...

git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@477 be28352e-c001-0410-b1a7-c7978e42abec

diff --git a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
index ee88640..0a8dc41 100644 (file)
--- a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
+++ b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java
@@ -470,7 +470,7 @@ public class ClientDocument extends uk.ac.vamsas.client.ClientDocument implement
       throw new java.io.IOException("Document is closed.");
     }
     if (iohandler==null) {
-      log.warn("updateSessionDocument called document iohandler handler.");
+      log.warn("updateSessionDocument called on null document iohandler handler.");
       throw new java.io.IOException("Document is closed.");
     }
     
@@ -571,7 +571,7 @@ public class ClientDocument extends uk.ac.vamsas.client.ClientDocument implement
       doc = null;
     }
     // disengage from client
-    if (sclient!=null)
+    if (sclient!=null && sclient.cdocument==this)
       sclient.cdocument = null;
     sclient=null;