From 22e9585ad31da6f7abb4cb6789fe774c75d542b3 Mon Sep 17 00:00:00 2001
From: anttil <anttil>
Date: Tue, 17 Jun 2014 10:36:07 +0000
Subject: [PATCH] SSDM-427: fix openbis tests
SVN: 31723
---
.../generic/shared/dto/identifier/IdentifierHelper.java | 9 +++------
1 file changed, 3 insertions(+), 6 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 aae2c8ff8fa..9a3a00d0251 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,16 +147,13 @@ public final class IdentifierHelper
private static SampleIdentifier createSampleIdentifier(
final DatabaseInstancePE databaseInstance, final SpacePE group, final String sampleCode)
{
- if (databaseInstance != null)
- {
- return new SampleIdentifier(createDatabaseInstanceIdentifier(databaseInstance),
- sampleCode);
- } else if (group != null)
+ if (group != null)
{
return new SampleIdentifier(createGroupIdentifier(group), sampleCode);
} else
{
- return SampleIdentifier.createHomeGroup(sampleCode);
+ return new SampleIdentifier(DatabaseInstanceIdentifier.createHome(),
+ sampleCode);
}
}
--
GitLab