Merge e4f8a12 into 74851c8

.gitignore

@@ -1,3 +1,4 @@
 .idea/
 p2o.iml
 target/
+poiji.iml

src/main/java/com/poiji/internal/marshaller/Unmarshaller.java

@@ -43,15 +43,19 @@ public <T> List<T> deserialize(Class<T> type, PoijiOptions options) {
 
             if (maxPhysicalNumberOfRows > list.size()) {
                 T t = deserialize0(currentRow, type);
-                list.add(t);
+                if (t != null) {
+                  list.add(t);
+                }
             }
         }
 
         return list;
     }
 
     private <T> T deserialize0(Row currentRow, Class<T> type) {
-
+        if (isRowEmpty(currentRow)) {
+          return null;
+        }
         T instance;
         try {
             instance = type.newInstance();
@@ -132,4 +136,13 @@ private Object castValue(Class<?> fieldType, String value) {
     private boolean skip(final Row currentRow, int skip) {
         return currentRow.getRowNum() + 1 <= skip;
     }
+
+  private boolean isRowEmpty(Row row) {
+    for (int c = row.getFirstCellNum(); c < row.getLastCellNum(); c++) {
+      Cell cell = row.getCell(c, Row.MissingCellPolicy.CREATE_NULL_AS_BLANK);
+      if (cell != null && cell.getCellType() != Cell.CELL_TYPE_BLANK)
+        return false;
+    }
+    return true;
+  }
 }