From 6805498a28e11b19c2d6157d489cd5745e7b43a1 Mon Sep 17 00:00:00 2001 From: lewa <lene.wasskog@nibio.no> Date: Mon, 26 Aug 2024 08:31:04 +0200 Subject: [PATCH] fix: Add null check for observation data map --- .../vips/logic/util/ExcelFileGenerator.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/no/nibio/vips/logic/util/ExcelFileGenerator.java b/src/main/java/no/nibio/vips/logic/util/ExcelFileGenerator.java index 93918b01..0e927d28 100644 --- a/src/main/java/no/nibio/vips/logic/util/ExcelFileGenerator.java +++ b/src/main/java/no/nibio/vips/logic/util/ExcelFileGenerator.java @@ -69,13 +69,15 @@ public final class ExcelFileGenerator { if (item.getObservationData() != null) { Map<String, Object> observationDataMap = objectMapper.readValue(item.getObservationData(), HashMap.class); - pestSheetColIndex = COL_START_INDEX_DATA; - for (String key : dataColumnTitles.keySet()) { - Object value = observationDataMap.get(key); - if (value instanceof Number) { - row.createCell(pestSheetColIndex++).setCellValue(((Number) value).intValue()); - } else { - row.createCell(pestSheetColIndex++).setCellValue(value != null ? value.toString() : ""); + if (observationDataMap != null) { + pestSheetColIndex = COL_START_INDEX_DATA; + for (String key : dataColumnTitles.keySet()) { + Object value = observationDataMap.get(key); + if (value instanceof Number) { + row.createCell(pestSheetColIndex++).setCellValue(((Number) value).intValue()); + } else { + row.createCell(pestSheetColIndex++).setCellValue(value != null ? value.toString() : ""); + } } } } -- GitLab