From c8ab4ad9ae0f76588ea92e61c741a703a94d7f19 Mon Sep 17 00:00:00 2001 From: Jan Eglinger Date: Fri, 16 Oct 2020 20:28:06 +0200 Subject: [PATCH] DefaultWidgetModel: check for null choicesList Let's fail fast and return null when item.getChoices() returns null. --- src/main/java/org/scijava/widget/DefaultWidgetModel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/scijava/widget/DefaultWidgetModel.java b/src/main/java/org/scijava/widget/DefaultWidgetModel.java index 1a768d5d7..91e301684 100644 --- a/src/main/java/org/scijava/widget/DefaultWidgetModel.java +++ b/src/main/java/org/scijava/widget/DefaultWidgetModel.java @@ -221,6 +221,7 @@ public Number getStepSize() { @Override public String[] getChoices() { final List choicesList = item.getChoices(); + if (choicesList == null) return null; final String[] choices = new String[choicesList.size()]; for (int i = 0; i < choices.length; i++) { choices[i] = objectService.getName(choicesList.get(i));