git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'Jalview-JS/develop' of https://source.jalview.org/git/jalview.git into...
[jalview.git]
/
src
/
jalview
/
io
/
vamsas
/
DatastoreRegistry.java
diff --git
a/src/jalview/io/vamsas/DatastoreRegistry.java
b/src/jalview/io/vamsas/DatastoreRegistry.java
index
7467d4d
..
ff7a764
100644
(file)
--- a/
src/jalview/io/vamsas/DatastoreRegistry.java
+++ b/
src/jalview/io/vamsas/DatastoreRegistry.java
@@
-83,8
+83,7
@@
public class DatastoreRegistry
if (dsregitem == null)
{
// create a new item entry
if (dsregitem == null)
{
// create a new item entry
- dsregitem = new Object[]
- { dsitem.jvobj, dsitem.vobj };
+ dsregitem = new Object[] { dsitem.jvobj, dsitem.vobj };
dsItemReg.put(dsitem, dsregitem);
dsObjReg.put(dsitem.jvobj, dsitem);
dsObjReg.put(dsitem.vobj, dsitem);
dsItemReg.put(dsitem, dsregitem);
dsObjReg.put(dsitem.jvobj, dsitem);
dsObjReg.put(dsitem.vobj, dsitem);
@@
-153,7
+152,8
@@
public class DatastoreRegistry
return dsregitem;
}
return dsregitem;
}
- protected void finalize()
+ @Override
+ protected void finalize() throws Throwable
{
if (dsObjReg != null)
{
{
if (dsObjReg != null)
{
@@
-172,5
+172,6
@@
public class DatastoreRegistry
{
dsItemReg.clear();
}
{
dsItemReg.clear();
}
+ super.finalize();
}
}
}
}