From cf009892a45e257542cf1df293f3d35a88da71ec Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 28 Sep 2016 11:09:55 +0000
Subject: [PATCH] SSDM-4135: fixing NPE bug in modified V3 API executors
SVN: 37128
---
.../v3/executor/sample/SetSampleExperimentExecutor.java | 5 ++++-
.../asapi/v3/executor/sample/SetSampleProjectExecutor.java | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleExperimentExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleExperimentExecutor.java
index ee411ddba49..5089a8b71fb 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleExperimentExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleExperimentExecutor.java
@@ -48,7 +48,10 @@ public class SetSampleExperimentExecutor extends AbstractSetEntityExperimentRela
@Override
protected void set(IOperationContext context, SamplePE entity, ExperimentPE related)
{
- relationshipService.assignSampleToExperiment(context.getSession(), entity, related);
+ if (related != null)
+ {
+ relationshipService.assignSampleToExperiment(context.getSession(), entity, related);
+ }
}
}
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleProjectExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleProjectExecutor.java
index 3ec400493db..0532c8cc72a 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleProjectExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/sample/SetSampleProjectExecutor.java
@@ -75,7 +75,10 @@ public class SetSampleProjectExecutor extends AbstractSetEntityToOneRelationExec
@Override
protected void set(IOperationContext context, SamplePE entity, ProjectPE related)
{
- relationshipService.assignSampleToProject(context.getSession(), entity, related);
+ if (related != null)
+ {
+ relationshipService.assignSampleToProject(context.getSession(), entity, related);
+ }
}
}
--
GitLab