JAL-2089 patch broken merge to master for Release 2.10.0b1

[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 436a811..ff7a764 100644 (file)
--- a/src/jalview/io/vamsas/DatastoreRegistry.java
+++ b/src/jalview/io/vamsas/DatastoreRegistry.java
@@ -1,6 +1,6 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -83,8 +83,7 @@ public class DatastoreRegistry
     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);
@@ -153,7 +152,8 @@ public class DatastoreRegistry
     return dsregitem;
   }
 
-  protected void finalize()
+  @Override
+  protected void finalize() throws Throwable
   {
     if (dsObjReg != null)
     {
@@ -172,5 +172,6 @@ public class DatastoreRegistry
     {
       dsItemReg.clear();
     }
+    super.finalize();
   }
 }