From bbefef49853a1a032d86d2a1b1e1c8f9836295a9 Mon Sep 17 00:00:00 2001
From: izabel <izabel>
Date: Wed, 16 Jun 2010 09:00:30 +0000
Subject: [PATCH] fix: NPE
SVN: 16545
---
.../server/business/bo/AbstractSampleBusinessObject.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
index 8568f69ef84..9075be64c61 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java
@@ -220,7 +220,7 @@ abstract class AbstractSampleBusinessObject extends AbstractSampleIdentifierBusi
final SampleIdentifier sampleIdentifier)
{
SamplePE sample = tryGetValidSample(parentIdentifierOrNull, sampleIdentifier);
- if (sample.getContainer() != null)
+ if (sample != null && sample.getContainer() != null)
{
throw UserFailureException.fromTemplate(
"Cannot register sample '%s': parent '%s' is part of another sample.",
--
GitLab