From 96bf706b67e822bdb9c40c6e21e0abdb1760db27 Mon Sep 17 00:00:00 2001
From: felmer <franz-josef.elmer@id.ethz.ch>
Date: Wed, 14 Nov 2018 11:38:34 +0100
Subject: [PATCH] SSDM-6958: throwing NPE in case of null elements because
Hibernate.query.setParameterList() doesn't it anymore
---
.../authorization/AuthorizationDataProvider.java | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
index ddfd34ec81b..ab001db8cae 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/AuthorizationDataProvider.java
@@ -323,6 +323,7 @@ final public class AuthorizationDataProvider implements IAuthorizationDataProvid
public void execute(List<V> entities)
{
List<?> mappedValues = valuesMapperOrNull != null ? valuesMapperOrNull.map(entities) : entities;
+ assertNoNullElements(mappedValues);
query.setParameterList(parameterName, mappedValues);
List<R> singleResults = cast(query.list());
@@ -356,6 +357,17 @@ final public class AuthorizationDataProvider implements IAuthorizationDataProvid
return fullResults;
}
+
+ private void assertNoNullElements(List<?> list)
+ {
+ for (Object object : list)
+ {
+ if (object == null)
+ {
+ throw new NullPointerException();
+ }
+ }
+ }
@Override
public SpacePE tryGetSpace(SpaceOwnerKind kind, TechId techId)
--
GitLab