From 06ae96e403c1ce67a3186490c140ac1f7b4a1c90 Mon Sep 17 00:00:00 2001
From: gpawel <gpawel>
Date: Wed, 14 Sep 2011 20:59:42 +0000
Subject: [PATCH] LMS-2495 Flexible import/upload: bugfix
SVN: 22957
---
.../plugin/generic/server/SampleRegisterOrUpdateUtil.java | 8 --------
1 file changed, 8 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/SampleRegisterOrUpdateUtil.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/SampleRegisterOrUpdateUtil.java
index 87a0e4b0632..deb29010748 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/SampleRegisterOrUpdateUtil.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/server/SampleRegisterOrUpdateUtil.java
@@ -20,8 +20,6 @@ import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.common.shared.basic.utils.StringUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ListOrSearchSampleCriteria;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewSample;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
@@ -80,12 +78,6 @@ public class SampleRegisterOrUpdateUtil
{
String newSampleContainerCode = newSampleIdentifier.tryGetContainerCode();
String newSampleContainerSpace = newSample.getDefaultSpaceIdentifier();
- if (false == StringUtils.isBlank(newSampleContainerCode)
- && false == StringUtils.isBlank(newSample.getCurrentContainerIdentifier()))
- {
- throw new UserFailureException("Current container is specified, but the identifier '"
- + newSample.getIdentifier() + "' includes the container code.");
- }
if (newSampleContainerCode == null && newSample.getCurrentContainerIdentifier() != null)
{
SampleIdentifier newSampleContainerIdentifier =
--
GitLab