Fix for #85, adding null check for MissingCellPolicy

monitorjbl · Apr 23, 2017 · cfb078c · cfb078c
1 parent b517261
commit cfb078c
Showing 1 changed file with 14 additions and 15 deletions.
diff --git a/src/main/java/com/monitorjbl/xlsx/impl/StreamingRow.java b/src/main/java/com/monitorjbl/xlsx/impl/StreamingRow.java
@@ -112,6 +112,20 @@ public short getFirstCellNum() {
     return cellMap.firstKey().shortValue();
   }
 
+  /**
+   * {@inheritDoc}
+   */
+  @Override
+  public Cell getCell(int cellnum, MissingCellPolicy policy) {
+    StreamingCell cell = (StreamingCell) cellMap.get(cellnum);
+    if(policy == MissingCellPolicy.CREATE_NULL_AS_BLANK) {
+      if(cell == null) { return new StreamingCell(cellnum, rowIndex, false); }
+    } else if(policy == MissingCellPolicy.RETURN_BLANK_AS_NULL) {
+      if(cell == null || cell.getCellTypeEnum() == CellType.BLANK) { return null; }
+    }
+    return cell;
+  }
+
   /* Not supported */
 
   /**
@@ -154,21 +168,6 @@ public void setRowNum(int rowNum) {
     throw new NotSupportedException();
   }
 
-  /**
-   * Not supported
-   */
-  @Override
-  public Cell getCell(int cellnum, MissingCellPolicy policy) {
-	  StreamingCell cell = (StreamingCell) cellMap.get(cellnum);
-	  if (policy == Row.CREATE_NULL_AS_BLANK) {
-		  if (cell == null) return new StreamingCell(cellnum, rowIndex, false);
-
-	  } else if (policy == Row.RETURN_BLANK_AS_NULL) {
-		  if (cell.getCellType() == Cell.CELL_TYPE_BLANK) return null;
-	  }
-	  return cell;
-  }
-
   /**
    * Not supported
    */