From 5330de04732743861859fbce020f7e933b76568c Mon Sep 17 00:00:00 2001 From: Kai Kreuzer Date: Thu, 19 Nov 2020 20:13:23 +0100 Subject: [PATCH] Avoid potential NPE (#1839) Signed-off-by: Kai Kreuzer --- .../openhab/core/model/item/internal/GenericItemProvider.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java index 465394dd3ec..c815e8e3f6b 100644 --- a/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java +++ b/bundles/org.openhab.core.model.item/src/org/openhab/core/model/item/internal/GenericItemProvider.java @@ -300,7 +300,8 @@ private void dispatchBindingsPerItemType(@Nullable BindingConfigReader reader, S if (model != null) { for (ModelItem modelItem : model.getItems()) { for (String itemType : itemTypes) { - if (itemType.equals(ItemUtil.getMainItemType(modelItem.getType()))) { + String type = modelItem.getType(); + if (type != null && itemType.equals(ItemUtil.getMainItemType(type))) { Item item = createItemFromModelItem(modelItem); if (item != null) { internalDispatchBindings(reader, modelName, item, modelItem.getBindings());