From 16b02126b43428f0098bd1354c792fa78024b98a Mon Sep 17 00:00:00 2001 From: snotling Date: Fri, 24 May 2013 17:52:22 +0300 Subject: [PATCH] MODE-1947 Corrected potential null pointer exception in Excel sequencer Handle undefined cells in Excel documents --- .../sequencer/msoffice/excel/ExcelMetadataReader.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sequencers/modeshape-sequencer-msoffice/src/main/java/org/modeshape/sequencer/msoffice/excel/ExcelMetadataReader.java b/sequencers/modeshape-sequencer-msoffice/src/main/java/org/modeshape/sequencer/msoffice/excel/ExcelMetadataReader.java index 447d4b8c4a..5ef037fad5 100644 --- a/sequencers/modeshape-sequencer-msoffice/src/main/java/org/modeshape/sequencer/msoffice/excel/ExcelMetadataReader.java +++ b/sequencers/modeshape-sequencer-msoffice/src/main/java/org/modeshape/sequencer/msoffice/excel/ExcelMetadataReader.java @@ -71,6 +71,11 @@ public static ExcelMetadata instance( InputStream stream ) throws IOException { for (int cellNum = row.getFirstCellNum(); cellNum < lastCellNum; cellNum++) { HSSFCell cell = row.getCell(cellNum); + // Undefined cells are returned as null + if (cell == null) { + continue; + } + /* * Builds a string of body content from all string, numeric, * and formula values in the body of each worksheet.