From de8db15928e627061b3c51c45d22beeb3795f905 Mon Sep 17 00:00:00 2001 From: anhefti Date: Tue, 31 Mar 2020 14:26:40 +0200 Subject: [PATCH] minor fix --- .../gui/service/page/impl/PageServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java index 90c6a5fd..c4557726 100644 --- a/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java +++ b/src/main/java/ch/ethz/seb/sebserver/gui/service/page/impl/PageServiceImpl.java @@ -17,6 +17,7 @@ import java.util.Set; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; +import java.util.stream.Stream; import javax.servlet.http.HttpSession; @@ -231,11 +232,15 @@ public class PageServiceImpl implements PageService { entity.entityType(), CallType.GET_DEPENDENCIES); - return builder - .withURIVariable(API.PARAM_MODEL_ID, String.valueOf(entity.getModelId())) - .withQueryParam(API.PARAM_BULK_ACTION_TYPE, BulkActionType.DEACTIVATE.name()) - .call() - .getOrThrow().stream(); + if (builder != null) { + return builder + .withURIVariable(API.PARAM_MODEL_ID, String.valueOf(entity.getModelId())) + .withQueryParam(API.PARAM_BULK_ACTION_TYPE, BulkActionType.DEACTIVATE.name()) + .call() + .getOrThrow().stream(); + } else { + return Stream.empty(); + } }).count(); if (dependencies > 0) { return new LocTextKey(CONFIRM_DEACTIVATION_KEY, String.valueOf(dependencies));