You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ce...@apache.org on 2021/12/06 14:59:19 UTC
svn commit: r1895624 - in /poi/trunk: poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtilCopy.java
Author: centic
Date: Mon Dec 6 14:59:18 2021
New Revision: 1895624
URL: http://svn.apache.org/viewvc?rev=1895624&view=rev
Log:
Close some streams/workbooks properly
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
poi/trunk/poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtilCopy.java
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java?rev=1895624&r1=1895623&r2=1895624&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/usermodel/XSSFPictureData.java Mon Dec 6 14:59:18 2021
@@ -18,6 +18,7 @@
package org.apache.poi.xssf.usermodel;
import java.io.IOException;
+import java.io.InputStream;
import org.apache.poi.ooxml.POIXMLDocumentPart;
import org.apache.poi.ooxml.POIXMLException;
@@ -65,13 +66,13 @@ public class XSSFPictureData extends POI
* Construct XSSFPictureData from a package part
*
* @param part the package part holding the drawing data,
- *
+ *
* @since POI 3.14-Beta1
*/
protected XSSFPictureData(PackagePart part) {
super(part);
}
-
+
/**
* Gets the picture data as a byte array.
* <p>
@@ -86,8 +87,8 @@ public class XSSFPictureData extends POI
* @return the picture data.
*/
public byte[] getData() {
- try {
- return IOUtils.toByteArray(getPackagePart().getInputStream());
+ try (InputStream inputStream = getPackagePart().getInputStream()) {
+ return IOUtils.toByteArray(inputStream);
} catch(IOException e) {
throw new POIXMLException(e);
}
@@ -116,7 +117,7 @@ public class XSSFPictureData extends POI
}
/**
- * *PictureData objects store the actual content in the part directly without keeping a
+ * *PictureData objects store the actual content in the part directly without keeping a
* copy like all others therefore we need to handle them differently.
*/
@Override
Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtilCopy.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtilCopy.java?rev=1895624&r1=1895623&r2=1895624&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtilCopy.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/util/BaseTestCellUtilCopy.java Mon Dec 6 14:59:18 2021
@@ -19,6 +19,7 @@ package org.apache.poi.ss.util;
import org.apache.poi.common.usermodel.HyperlinkType;
import org.apache.poi.ss.usermodel.*;
+import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -30,6 +31,16 @@ public abstract class BaseTestCellUtilCo
protected Cell srcCell, destCell; //used for testCopyCellFrom_CellCopyPolicy
+ @AfterEach
+ public void tearDown() throws IOException {
+ if (srcCell != null) {
+ srcCell.getRow().getSheet().getWorkbook().close();
+ }
+ if (destCell != null) {
+ destCell.getRow().getSheet().getWorkbook().close();
+ }
+ }
+
@Test
public final void testCopyCellFrom_CellCopyPolicy_default() {
setUp_testCopyCellFrom_CellCopyPolicy();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org