From 8541e4027b11f41238dac6e341d5d3c69240644c Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 12 May 2016 13:28:27 +0000
Subject: [PATCH] SSDM-3598: fixing potential NPE
SVN: 36527
---
.../entity/AbstractUpdateEntityToOneRelationExecutor.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToOneRelationExecutor.java b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToOneRelationExecutor.java
index 05d24eb4ab2..0f55c60dfd1 100644
--- a/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToOneRelationExecutor.java
+++ b/openbis/source/java/ch/ethz/sis/openbis/generic/server/asapi/v3/executor/entity/AbstractUpdateEntityToOneRelationExecutor.java
@@ -118,7 +118,10 @@ public abstract class AbstractUpdateEntityToOneRelationExecutor<ENTITY_UPDATE, E
check(context, entity, relatedId, related);
update(context, entity, related);
allAdded.add(related);
- allRemoved.add(currentlyRelated);
+ if (currentlyRelated != null)
+ {
+ allRemoved.add(currentlyRelated);
+ }
}
}
--
GitLab