Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

@@ -17,7 +17,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.2.16</version>
+	<version>0.2.17</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 

src/main/java/info/unterrainer/commons/httpserver/daos/JpqlCoreDao.java

@@ -222,7 +222,7 @@ private String addTenantWhere(final String whereClause, final Set<Long> tenantId
 			r = "( " + whereClause + ") AND ";
 
 		r += String.format("( tenantTable.%1$s IS NULL ", tenantData.getTenantIdField());
-		if (!tenantIds.isEmpty())
+		if (tenantIds != null && !tenantIds.isEmpty())
 			r += String.format(" OR tenantTable.%1$s IN (:tenantIds) ", tenantData.getTenantIdField());
 		r += ")";
 		return r;
@@ -234,7 +234,7 @@ private Map<String, Object> addTenantParams(final Map<String, Object> map, final
 			m = new HashMap<>();
 		else
 			m = new HashMap<>(map);
-		if (!hasTenantData() || tenantIds.isEmpty())
+		if (!hasTenantData() || tenantIds == null || tenantIds.isEmpty())
 			return m;
 		m.put("tenantIds", tenantIds);
 		return m;