From 034f5a16d595a288389bdae61e8f0eae260d3ef5 Mon Sep 17 00:00:00 2001 From: jprocter Date: Thu, 27 Sep 2007 12:58:36 +0000 Subject: [PATCH] made finalize check before zeroing self-references in SimpleClient (this is only necessary if finalize is called explicitly). Also fixed typo in warning message git-svn-id: https://svn.lifesci.dundee.ac.uk/svn/repository/trunk@477 be28352e-c001-0410-b1a7-c7978e42abec --- src/uk/ac/vamsas/client/simpleclient/ClientDocument.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java b/src/uk/ac/vamsas/client/simpleclient/ClientDocument.java index ee88640..0a8dc41 100644 --- 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; -- 1.7.10.2