From 8e766d8a8e463384c10d95afecc59a3aa0f5e45d Mon Sep 17 00:00:00 2001 From: chani <71597530+csbiy@users.noreply.github.com> Date: Sat, 10 Jan 2026 17:26:01 +0900 Subject: [PATCH 1/3] fix: add null check for WriteSheetHolder in afterWorkbookDispose Add null check for writeSheetHolder before accessing its methods to prevent NullPointerException when the map contains null values. Fixes #788 --- .../write/handler/impl/DimensionWorkbookWriteHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java index e6575e753..0fc6c3390 100644 --- a/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java +++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java @@ -57,7 +57,9 @@ public void afterWorkbookDispose(WriteWorkbookHolder writeWorkbookHolder) { return; } for (WriteSheetHolder writeSheetHolder : writeSheetHolderMap.values()) { - if (writeSheetHolder.getSheet() == null || !(writeSheetHolder.getSheet() instanceof SXSSFSheet)) { + if (writeSheetHolder == null + || writeSheetHolder.getSheet() == null + || !(writeSheetHolder.getSheet() instanceof SXSSFSheet)) { continue; } SXSSFSheet sxssfSheet = ((SXSSFSheet) writeSheetHolder.getSheet()); From 42b7e73fcf3ca5d70727825a1a838a5342958d26 Mon Sep 17 00:00:00 2001 From: chani <71597530+csbiy@users.noreply.github.com> Date: Sat, 10 Jan 2026 17:30:57 +0900 Subject: [PATCH 2/3] fix: prevent NPE in afterWorkbookDispose Map can contain null writeSheetHolder values, causing NPE when accessing getSheet(). Added guard clause for null entries. Fixes #788 --- .../write/handler/impl/DimensionWorkbookWriteHandler.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java index 0fc6c3390..4d0e2d160 100644 --- a/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java +++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java @@ -57,8 +57,11 @@ public void afterWorkbookDispose(WriteWorkbookHolder writeWorkbookHolder) { return; } for (WriteSheetHolder writeSheetHolder : writeSheetHolderMap.values()) { - if (writeSheetHolder == null - || writeSheetHolder.getSheet() == null + // map can contain null entries + if (writeSheetHolder == null) { + continue; + } + if (writeSheetHolder.getSheet() == null || !(writeSheetHolder.getSheet() instanceof SXSSFSheet)) { continue; } From d04211aaa4056f5c263b123d79184ea33842bbff Mon Sep 17 00:00:00 2001 From: csbiy Date: Sat, 10 Jan 2026 23:04:05 +0900 Subject: [PATCH 3/3] test : add unit test for WriteSheetHolder NPE --- .../impl/DimensionWorkbookWriteHandler.java | 4 +- .../DimensionWorkbookWriteHandlerTest.java | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 fesod-sheet/src/test/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandlerTest.java diff --git a/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java b/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java index 4d0e2d160..d2b5433b8 100644 --- a/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java +++ b/fesod-sheet/src/main/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandler.java @@ -57,12 +57,10 @@ public void afterWorkbookDispose(WriteWorkbookHolder writeWorkbookHolder) { return; } for (WriteSheetHolder writeSheetHolder : writeSheetHolderMap.values()) { - // map can contain null entries if (writeSheetHolder == null) { continue; } - if (writeSheetHolder.getSheet() == null - || !(writeSheetHolder.getSheet() instanceof SXSSFSheet)) { + if (writeSheetHolder.getSheet() == null || !(writeSheetHolder.getSheet() instanceof SXSSFSheet)) { continue; } SXSSFSheet sxssfSheet = ((SXSSFSheet) writeSheetHolder.getSheet()); diff --git a/fesod-sheet/src/test/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandlerTest.java b/fesod-sheet/src/test/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandlerTest.java new file mode 100644 index 000000000..126b1704a --- /dev/null +++ b/fesod-sheet/src/test/java/org/apache/fesod/sheet/write/handler/impl/DimensionWorkbookWriteHandlerTest.java @@ -0,0 +1,50 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.apache.fesod.sheet.write.handler.impl; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; +import java.util.HashMap; +import java.util.Map; +import org.apache.fesod.sheet.write.metadata.holder.WriteSheetHolder; +import org.apache.fesod.sheet.write.metadata.holder.WriteWorkbookHolder; +import org.apache.poi.xssf.streaming.SXSSFWorkbook; +import org.junit.jupiter.api.Test; + +class DimensionWorkbookWriteHandlerTest { + + @Test + void afterWorkbookDispose_shouldNotThrowNPE_whenMapContainsNullValue() { + // Given + DimensionWorkbookWriteHandler handler = new DimensionWorkbookWriteHandler(); + WriteWorkbookHolder writeWorkbookHolder = mock(WriteWorkbookHolder.class); + SXSSFWorkbook workbook = mock(SXSSFWorkbook.class); + + Map sheetHolderMap = new HashMap<>(); + sheetHolderMap.put(0, null); // null entry that caused NPE + + when(writeWorkbookHolder.getWorkbook()).thenReturn(workbook); + when(writeWorkbookHolder.getHasBeenInitializedSheetIndexMap()).thenReturn(sheetHolderMap); + + // When & Then + assertDoesNotThrow(() -> handler.afterWorkbookDispose(writeWorkbookHolder)); + } +}