SSDM-3412: Forward porting from stage r36047 (SSDM-3397: adding log for data...

SSDM-3412: Forward porting from stage r36047 (SSDM-3397: adding log for data set failed in sanity check of multi data set archiving.) and r36048 (SSDM-3397: throw IllegalArgumentException if children path infos are Null.)

SVN: 36081

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

@@ -409,6 +409,10 @@ public class MultiDataSetArchiver extends AbstractArchiverProcessingPlugin
                 {
                     throw new RuntimeException(status.tryGetErrorMessage());
                 }
+            } catch (RuntimeException ex)
+            {
+                operationLog.error("Sanity check for data set " + dataSetCode + " failed: " + ex);
+                throw ex;
             } finally
             {
                 if (content != null)

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/content/PathInfoProviderBasedHierarchicalContent.java

@@ -245,6 +245,10 @@ public class PathInfoProviderBasedHierarchicalContent implements IHierarchicalCo
         {
             List<DataSetPathInfo> pathInfos =
                     dataSetPathInfoProvider.listChildrenPathInfos(pathInfo);
+            if (pathInfos == null)
+            {
+                throw new IllegalArgumentException("No children path infos for " + pathInfo.getRelativePath());
+            }
             List<IHierarchicalContentNode> result = new ArrayList<IHierarchicalContentNode>();
             for (DataSetPathInfo child : pathInfos)
             {