From bcaab496b69443b0904e45c1ae168db41c2ea8eb Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Mon, 26 Oct 2015 07:54:06 +0000
Subject: [PATCH] Bug 56957: Avoid error if Workbook with empty
 SharedStringTable is written

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1710521 13f79535-47bb-0310-9956-ffa450edef68
---
 .../marshallers/ZipPartMarshaller.java        |   7 ++++
 .../poi/xssf/usermodel/TestXSSFWorkbook.java  |  39 ++++++++++++++++++
 test-data/spreadsheet/56957.xlsx              | Bin 0 -> 7183 bytes
 3 files changed, 46 insertions(+)
 create mode 100644 test-data/spreadsheet/56957.xlsx

diff --git a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
index 296f7a6c67..8860ae37e5 100644
--- a/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
+++ b/src/ooxml/java/org/apache/poi/openxml4j/opc/internal/marshallers/ZipPartMarshaller.java
@@ -38,6 +38,7 @@ import org.apache.poi.openxml4j.opc.internal.ZipHelper;
 import org.apache.poi.util.DocumentHelper;
 import org.apache.poi.util.POILogFactory;
 import org.apache.poi.util.POILogger;
+import org.apache.poi.xssf.usermodel.XSSFRelation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -63,6 +64,12 @@ public final class ZipPartMarshaller implements PartMarshaller {
 			// Normally should happen only in developement phase, so just throw
 			// exception
 		}
+		
+		// check if there is anything to save for some parts. We don't do this for all parts as some code
+		// might depend on empty parts being saved, e.g. some unit tests verify this currently.
+		if(part.getSize() == 0 && part.getPartName().getName().equals(XSSFRelation.SHARED_STRINGS.getDefaultFileName())) {
+		    return true;
+		}
 
 		ZipOutputStream zos = (ZipOutputStream) os;
 		ZipEntry partEntry = new ZipEntry(ZipHelper
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
index f5fdd4363d..199a3fe307 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFWorkbook.java
@@ -40,10 +40,12 @@ import org.apache.poi.POIXMLProperties;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.openxml4j.opc.ContentTypes;
 import org.apache.poi.openxml4j.opc.OPCPackage;
+import org.apache.poi.openxml4j.opc.PackageAccess;
 import org.apache.poi.openxml4j.opc.PackagePart;
 import org.apache.poi.openxml4j.opc.PackagePartName;
 import org.apache.poi.openxml4j.opc.PackageRelationshipCollection;
 import org.apache.poi.openxml4j.opc.PackagingURIHelper;
+import org.apache.poi.openxml4j.opc.internal.FileHelper;
 import org.apache.poi.openxml4j.opc.internal.MemoryPackagePart;
 import org.apache.poi.openxml4j.opc.internal.PackagePropertiesPart;
 import org.apache.poi.ss.SpreadsheetVersion;
@@ -1019,5 +1021,42 @@ public final class TestXSSFWorkbook extends BaseTestWorkbook {
         finally {
             IOUtils.closeQuietly(wb);
         }
+	}
+
+    @Test
+    public void testBug56957CloseWorkbook() throws Exception {
+        File file = TempFile.createTempFile("TestBug56957_", ".xlsx");
+        
+        try {
+            // as the file is written to, we make a copy before actually working on it
+            FileHelper.copyFile(new File("test-data/spreadsheet/56957.xlsx"), file);
+            
+            assertTrue(file.exists());
+            
+            // read-only mode works!
+            Workbook workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ));
+            System.out.println(workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue().toString());
+            workbook.close();
+            workbook = null;
+    
+            workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ));
+            System.out.println(workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue().toString());
+            workbook.close();
+            workbook = null;
+    
+            // now check read/write mode
+            workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ_WRITE));
+            System.out.println(workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue().toString());
+            workbook.close();
+            workbook = null;
+    
+            workbook = WorkbookFactory.create(OPCPackage.open(file, PackageAccess.READ_WRITE));
+            System.out.println(workbook.getSheetAt(0).getRow(0).getCell(0, Row.CREATE_NULL_AS_BLANK).getDateCellValue().toString());
+            workbook.close();
+            workbook = null;
+        } finally {
+            assertTrue(file.exists());
+            assertTrue(file.delete());
+        }
     }
 }
diff --git a/test-data/spreadsheet/56957.xlsx b/test-data/spreadsheet/56957.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b58aa62dbb29c3e2a478d75c12e097fe7cb7b696
GIT binary patch
literal 7183
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
Hm%si6qX3Pk

literal 0
HcmV?d00001