From 1fbfc70cca4335894ca94d6b8aaf59d8521e45a1 Mon Sep 17 00:00:00 2001
From: Nick Burch <nick@apache.org>
Date: Wed, 16 Dec 2015 18:15:31 +0000
Subject: [PATCH] Unit test for #58731 - not reproduced, and some javadocs

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1720411 13f79535-47bb-0310-9956-ffa450edef68
---
 src/java/org/apache/poi/POIDocument.java      |   5 +++
 .../java/org/apache/poi/POIXMLDocument.java   |   5 +++
 .../poi/xssf/usermodel/TestXSSFBugs.java      |  31 ++++++++++++++++++
 test-data/spreadsheet/58731.xlsx              | Bin 0 -> 9023 bytes
 4 files changed, 41 insertions(+)
 create mode 100644 test-data/spreadsheet/58731.xlsx

diff --git a/src/java/org/apache/poi/POIDocument.java b/src/java/org/apache/poi/POIDocument.java
index 2131ad857..aa8ccb378 100644
--- a/src/java/org/apache/poi/POIDocument.java
+++ b/src/java/org/apache/poi/POIDocument.java
@@ -19,6 +19,7 @@ package org.apache.poi;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -301,6 +302,10 @@ public abstract class POIDocument {
      * Writes the document out to the specified output stream. The
      * stream is not closed as part of this operation.
      * 
+     * Note - if the Document was opened from a {@link File} rather
+     *  than an {@link InputStream}, you <b>must</b> write out to
+     *  a different file, overwriting via an OutputStream isn't possible.
+     * 
      * @param out The stream to write to.
      * 
      * @throws IOException thrown on errors writing to the stream
diff --git a/src/ooxml/java/org/apache/poi/POIXMLDocument.java b/src/ooxml/java/org/apache/poi/POIXMLDocument.java
index b0b5d4454..cbb1d80cc 100644
--- a/src/ooxml/java/org/apache/poi/POIXMLDocument.java
+++ b/src/ooxml/java/org/apache/poi/POIXMLDocument.java
@@ -17,6 +17,7 @@
 package org.apache.poi;
 
 import java.io.Closeable;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -196,6 +197,10 @@ public abstract class POIXMLDocument extends POIXMLDocumentPart implements Close
     /**
      * Write out this document to an Outputstream.
      *
+     * Note - if the Document was opened from a {@link File} rather
+     *  than an {@link InputStream}, you <b>must</b> write out to
+     *  a different file, overwriting via an OutputStream isn't possible.
+     * 
      * @param stream - the java OutputStream you wish to write the file to
      *
      * @exception IOException if anything can't be written.
diff --git a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
index 7004ec36d..ef57ae069 100644
--- a/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
+++ b/src/ooxml/testcases/org/apache/poi/xssf/usermodel/TestXSSFBugs.java
@@ -2850,4 +2850,35 @@ public final class TestXSSFBugs extends BaseTestBugzillaIssues {
         assertNotNull(wbBack);
         wbBack.close();
     }
+    
+    public void test58731() throws Exception {
+        Workbook wb = XSSFTestDataSamples.openSampleWorkbook("58731.xlsx");
+        Sheet sheet = wb.createSheet("Java Books");
+        
+        Object[][] bookData = {
+                {"Head First Java", "Kathy Serria", 79},
+                {"Effective Java", "Joshua Bloch", 36},
+                {"Clean Code", "Robert martin", 42},
+                {"Thinking in Java", "Bruce Eckel", 35},
+        };
+ 
+        int rowCount = 0;
+        for (Object[] aBook : bookData) {
+            Row row = sheet.createRow(++rowCount);
+             
+            int columnCount = 0;
+            for (Object field : aBook) {
+                Cell cell = row.createCell(++columnCount);
+                if (field instanceof String) {
+                    cell.setCellValue((String) field);
+                } else if (field instanceof Integer) {
+                    cell.setCellValue((Integer) field);
+                }
+            }
+        }
+        
+        Workbook wb2 = XSSFTestDataSamples.writeOutAndReadBack(wb);
+        sheet = wb.getSheet("Java Books");
+        assertEquals(bookData[0][0], sheet.getRow(0).getCell(0).getStringCellValue());
+    }
 }
diff --git a/test-data/spreadsheet/58731.xlsx b/test-data/spreadsheet/58731.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..80e22f3d17b6eef7156e1d3d51e5e710e12209ac
GIT binary patch
literal 9023
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

literal 0
HcmV?d00001