From 2d4008e8f00967ddec95d17385918b282a460ba6 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Tue, 15 Feb 2011 09:28:25 +0000
Subject: [PATCH] minor: [LMS-2033] getSampleForUpdate() now returns NULL
 instead of throwing a runtime exception.

SVN: 19951
---
 .../api/v1/impl/AbstractTransactionState.java            | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java
index 78357e1c4e0..cebc8fed72d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java
@@ -151,8 +151,13 @@ abstract class AbstractTransactionState<T extends DataSetInformation>
             ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample sample =
                     openBisService.tryGetSampleWithExperiment(sampleIdentifier);
 
-            Sample result = new Sample(sample);
-            samplesToBeUpdated.add(result);
+            Sample result = null;
+            if (sample != null)
+            {
+                result = new Sample(sample);
+                samplesToBeUpdated.add(result);
+            }
+
             return result;
         }
 
-- 
GitLab