git://source.jalview.org
/
vamsas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
made finalize check before zeroing self-references in SimpleClient (this is only...
[vamsas.git]
/
src
/
uk
/
ac
/
vamsas
/
client
/
simpleclient
/
ClientDocument.java
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) {
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.");
}
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
doc = null;
}
// disengage from client
- if (sclient!=null)
+ if (sclient!=null && sclient.cdocument==this)
sclient.cdocument = null;
sclient=null;
sclient.cdocument = null;
sclient=null;