From 60cf2002836a9108b0959b9424a7432940e6c7b2 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Tue, 17 Jun 2014 12:48:21 +0000
Subject: [PATCH] SSDM-427: fix openbis tests
SVN: 31724
---
.../generic/shared/dto/identifier/IdentifierHelper.java | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java
index 9a3a00d0251..aae2c8ff8fa 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/IdentifierHelper.java
@@ -147,13 +147,16 @@ public final class IdentifierHelper
private static SampleIdentifier createSampleIdentifier(
final DatabaseInstancePE databaseInstance, final SpacePE group, final String sampleCode)
{
- if (group != null)
+ if (databaseInstance != null)
+ {
+ return new SampleIdentifier(createDatabaseInstanceIdentifier(databaseInstance),
+ sampleCode);
+ } else if (group != null)
{
return new SampleIdentifier(createGroupIdentifier(group), sampleCode);
} else
{
- return new SampleIdentifier(DatabaseInstanceIdentifier.createHome(),
- sampleCode);
+ return SampleIdentifier.createHomeGroup(sampleCode);
}
}
--
GitLab