From 63bd085d421cc13af751ddf473ed315c4b102a95 Mon Sep 17 00:00:00 2001 From: Adam Rauch Date: Mon, 19 May 2025 14:21:13 -0700 Subject: [PATCH] Null check field map before using it --- .../labkey/api/data/MultiValuedRenderContext.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/api/src/org/labkey/api/data/MultiValuedRenderContext.java b/api/src/org/labkey/api/data/MultiValuedRenderContext.java index 0cb083e3a6f..096c6165222 100644 --- a/api/src/org/labkey/api/data/MultiValuedRenderContext.java +++ b/api/src/org/labkey/api/data/MultiValuedRenderContext.java @@ -110,12 +110,15 @@ public Object get(Object key) if ("".equals(value)) value = null; - ColumnInfo columnInfo = getFieldMap().get(key); - // The value was concatenated with others, so it's become a string. - // Do conversion to switch it back to the expected type. - if (value != null && columnInfo != null && !columnInfo.getJavaClass().isInstance(value)) + if (getFieldMap() != null) { - value = ConvertUtils.convert(value.toString(), columnInfo.getJavaClass()); + ColumnInfo columnInfo = getFieldMap().get(key); + // The value was concatenated with others, so it's become a string. + // Do conversion to switch it back to the expected type. + if (value != null && columnInfo != null && !columnInfo.getJavaClass().isInstance(value)) + { + value = ConvertUtils.convert(value.toString(), columnInfo.getJavaClass()); + } } } else