From 68778e67868fa34ace8e22d70ae8319806f2a05f Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Mon, 27 Aug 2012 11:08:35 +0000
Subject: [PATCH] Correct handling of container updates
SVN: 26456
---
.../openbis/generic/server/business/bo/DataSetTable.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java
index 65c916fa126..7474b38f909 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java
@@ -997,11 +997,13 @@ public final class DataSetTable extends AbstractDataSetBusinessObject implements
}
if (details.isContainerUpdateRequested())
{
- if (dataSet.isContainer())
+ if (dataSetUpdates.getModifiedContainedDatasetCodesOrNull() != null)
{
setContainedDataSets(dataSet,
Arrays.asList(dataSetUpdates.getModifiedContainedDatasetCodesOrNull()));
- } else
+ }
+
+ if (dataSetUpdates.getModifiedContainerDatasetCodeOrNull() != null)
{
updateContainer(dataSet, dataSetUpdates.getModifiedContainerDatasetCodeOrNull());
}
--
GitLab