Author: fanningpj Date: Mon Jul 3 20:32:55 2017 New Revision: 1800712 URL: http://svn.apache.org/viewvc?rev=1800712&view=rev Log: [Bug 61246] remove flush method
Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java Modified: poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java?rev=1800712&r1=1800711&r2=1800712&view=diff ============================================================================== --- poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java (original) +++ poi/trunk/src/ooxml/java/org/apache/poi/xssf/streaming/SheetDataWriter.java Mon Jul 3 20:32:55 2017 @@ -20,6 +20,7 @@ package org.apache.poi.xssf.streaming; import java.io.BufferedWriter; +import java.io.Closeable; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -48,7 +49,7 @@ import org.openxmlformats.schemas.spread * this class only writes the "sheetData" document fragment * so that it was renamed to "SheetDataWriter" */ -public class SheetDataWriter { +public class SheetDataWriter implements Closeable { private static final POILogger logger = POILogFactory.getLogger(SheetDataWriter.class); private final File _fd; @@ -123,12 +124,8 @@ public class SheetDataWriter { * This method <em>must</em> be invoked before calling {@link #getWorksheetXMLInputStream()} */ public void close() throws IOException { - flush(); - _out.close(); - } - - protected void flush() throws IOException { _out.flush(); + _out.close(); } protected File getTempFile() { Modified: poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java URL: http://svn.apache.org/viewvc/poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java?rev=1800712&r1=1800711&r2=1800712&view=diff ============================================================================== --- poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java (original) +++ poi/trunk/src/ooxml/testcases/org/apache/poi/xssf/streaming/TestSheetDataWriter.java Mon Jul 3 20:32:55 2017 @@ -58,7 +58,7 @@ public final class TestSheetDataWriter { SheetDataWriter writer = new SheetDataWriter(); try { writer.outputQuotedString(unicodeSurrogates); - writer.flush(); + writer.close(); File file = writer.getTempFile(); FileInputStream is = new FileInputStream(file); String text; @@ -69,7 +69,7 @@ public final class TestSheetDataWriter { } assertEquals(unicodeSurrogates, text); } finally { - writer.close(); + IOUtils.closeQuietly(writer); } } } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@poi.apache.org For additional commands, e-mail: commits-h...@poi.apache.org