From 6036b1c502627d9c60537d5b617600219d0de44b Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Fri, 5 Oct 2012 13:39:08 +0000
Subject: [PATCH] SP-299 BIS-211 improve dataSet.getExperiment to return sample
experiment
SVN: 27063
---
.../cisd/etlserver/registrator/api/v1/impl/DataSet.java | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
index 61ee8c0258a..8acd0b0157f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java
@@ -117,7 +117,14 @@ public class DataSet<T extends DataSetInformation> extends AbstractDataSetImmuta
@Override
public IExperimentImmutable getExperiment()
{
+ if (experiment != null)
+ {
return experiment;
+ } else if (sampleOrNull != null)
+ {
+ return sampleOrNull.getExperiment();
+ }
+ return null;
}
@Override
--
GitLab