change: - Convert an assertion into a DataStructureException.

- 'performClosing' should be performed before the version is written out.

SVN: 7913

bds/source/java/ch/systemsx/cisd/bds/AbstractDataStructure.java

@@ -132,8 +132,8 @@ abstract class AbstractDataStructure implements IDataStructure, IDataStructureHa
     public final void close()
     {
         assertOpenOrCreated();
-        getVersion().saveTo(root);
         performClosing();
+        getVersion().saveTo(root);
         // TODO 2008-07-03, Bernd Rinn: make this optional
         // assertValid();
         storage.unmount();

bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_1.java

@@ -97,9 +97,11 @@ public final class DataStructureV1_1 extends DataStructureV1_0
     public final void setSample(final Sample sample)
     {
         assert sample != null : "Unspecified sample.";
-        assert sample instanceof SampleWithOwner : "Must be an instance of SampleWithOwner.";
-        assertOpenOrCreated();
-        sample.saveTo(getMetaDataDirectory());
+        if (sample instanceof SampleWithOwner == false)
+        {
+            throw new DataStructureException("Must be an instance of SampleWithOwner.");
+        }
+        super.setSample(sample);
     }
 
     @Override