BIS-38 SP-204 : Close hierarchical content objects

SVN: 26238

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPlugin.java

@@ -94,12 +94,12 @@ public class DataSetAndPathInfoDBConsistencyCheckProcessingPlugin implements IPr
 
         for (DatasetDescription dataset : datasets)
         {
+            IHierarchicalContent fileContent = null;
+            IHierarchicalContent pathInfoContent = null;
             try
             {
-                IHierarchicalContent fileContent =
-                        getFileProvider().asContent(dataset.getDataSetCode());
-                IHierarchicalContent pathInfoContent =
-                        getPathInfoProvider().asContent(dataset.getDataSetCode());
+                fileContent = getFileProvider().asContent(dataset.getDataSetCode());
+                pathInfoContent = getPathInfoProvider().asContent(dataset.getDataSetCode());
 
                 List<Difference> datasetDifferences = new ArrayList<Difference>();
 
@@ -128,6 +128,16 @@ public class DataSetAndPathInfoDBConsistencyCheckProcessingPlugin implements IPr
                         Status.createError("Couldn't check consistency of the file system and the path info database for a data set: "
                                 + dataset.getDataSetCode()
                                 + " because of the following exception: " + e.getMessage()));
+            } finally
+            {
+                if (null != fileContent)
+                {
+                    fileContent.close();
+                }
+                if (null != pathInfoContent)
+                {
+                    pathInfoContent.close();
+                }
             }
         }
 

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/standard/DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest.java

@@ -116,6 +116,7 @@ public class DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest extends
                     childIsDirectory();
                     getChildFileLength();
                     childIsChecksumPrecalculated();
+                    closeContent();
                     sendEmail();
                 }
 
@@ -127,6 +128,12 @@ public class DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest extends
                             new EMailAddress("a@bc.de"));
                 }
 
+                protected void closeContent()
+                {
+                    oneOf(fileContent).close();
+                    oneOf(pathInfoContent).close();
+                }
+
                 protected void childIsChecksumPrecalculated()
                 {
                     oneOf(pathInfoChildNode).isChecksumCRC32Precalculated();
@@ -145,7 +152,7 @@ public class DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest extends
                 {
                     exactly(2).of(fileChildNode).isDirectory();
                     will(returnValue(false));
-                    exactly(2).of(pathInfoChildNode).isDirectory();
+                    exactly(1).of(pathInfoChildNode).isDirectory();
                     will(returnValue(false));
                 }
 
@@ -214,5 +221,6 @@ public class DataSetAndPathInfoDBConsistencyCheckProcessingPluginTest extends
                 }
             });
         plugin.process(Arrays.asList(ds1), processingContext);
+        context.assertIsSatisfied();
     }
 }