You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2021/12/28 02:42:30 UTC
svn commit: r1896463 - in /poi/trunk: poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/ poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/ poi-ooxml/src/main/java/org/apache/poi/xssf/binary/ poi-ooxml/src/main/java/org/apache/poi/xssf/eventuse...
Author: fanningpj
Date: Tue Dec 28 02:42:29 2021
New Revision: 1896463
URL: http://svn.apache.org/viewvc?rev=1896463&view=rev
Log:
close input streams for parts
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
poi/trunk/poi/src/test/java9/module-info.class
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasterContents.java Tue Dec 28 02:42:29 2021
@@ -18,6 +18,7 @@
package org.apache.poi.xdgf.usermodel;
import java.io.IOException;
+import java.io.InputStream;
import com.microsoft.schemas.office.visio.x2012.main.MasterContentsDocument;
import org.apache.poi.ooxml.POIXMLException;
@@ -44,8 +45,8 @@ public class XDGFMasterContents extends
try {
- try {
- _pageContents = MasterContentsDocument.Factory.parse(getPackagePart().getInputStream()).getMasterContents();
+ try (InputStream stream = getPackagePart().getInputStream()) {
+ _pageContents = MasterContentsDocument.Factory.parse(stream).getMasterContents();
} catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFMasters.java Tue Dec 28 02:42:29 2021
@@ -18,6 +18,7 @@
package org.apache.poi.xdgf.usermodel;
import java.io.IOException;
+import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -59,8 +60,8 @@ public class XDGFMasters extends XDGFXML
@Override
protected void onDocumentRead() {
try {
- try {
- _mastersObject = MastersDocument.Factory.parse(getPackagePart().getInputStream()).getMasters();
+ try (InputStream stream = getPackagePart().getInputStream()) {
+ _mastersObject = MastersDocument.Factory.parse(stream).getMasters();
} catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPageContents.java Tue Dec 28 02:42:29 2021
@@ -18,6 +18,7 @@
package org.apache.poi.xdgf.usermodel;
import java.io.IOException;
+import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
@@ -43,8 +44,8 @@ public class XDGFPageContents extends XD
@Override
protected void onDocumentRead() {
try {
- try {
- _pageContents = PageContentsDocument.Factory.parse(getPackagePart().getInputStream()).getPageContents();
+ try (InputStream stream = getPackagePart().getInputStream()) {
+ _pageContents = PageContentsDocument.Factory.parse(stream).getPageContents();
} catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XDGFPages.java Tue Dec 28 02:42:29 2021
@@ -17,6 +17,7 @@
package org.apache.poi.xdgf.usermodel;
import java.io.IOException;
+import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -58,8 +59,8 @@ public class XDGFPages extends XDGFXMLDo
@Override
protected void onDocumentRead() {
try {
- try {
- _pagesObject = PagesDocument.Factory.parse(getPackagePart().getInputStream()).getPages();
+ try (InputStream stream = getPackagePart().getInputStream()) {
+ _pagesObject = PagesDocument.Factory.parse(stream).getPages();
} catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xdgf/usermodel/XmlVisioDocument.java Tue Dec 28 02:42:29 2021
@@ -64,8 +64,8 @@ public class XmlVisioDocument extends PO
VisioDocumentType document;
- try {
- document = VisioDocumentDocument1.Factory.parse(getPackagePart().getInputStream()).getVisioDocument();
+ try (InputStream stream = getPackagePart().getInputStream()){
+ document = VisioDocumentDocument1.Factory.parse(stream).getVisioDocument();
} catch (XmlException | IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/usermodel/XSLFPictureData.java Tue Dec 28 02:42:29 2021
@@ -85,8 +85,8 @@ public final class XSLFPictureData exten
* @return the Picture data.
*/
public byte[] getData() {
- try {
- return IOUtils.toByteArray(getInputStream());
+ try (InputStream stream = getInputStream()) {
+ return IOUtils.toByteArray(stream);
} catch (IOException e) {
throw new POIXMLException(e);
}
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/binary/XSSFBHyperlinksTable.java Tue Dec 28 02:42:29 2021
@@ -60,8 +60,10 @@ public class XSSFBHyperlinksTable {
//load the urls from the sheet .rels
loadUrlsFromSheetRels(sheetPart);
//now load the hyperlinks from the bottom of the sheet
- HyperlinkSheetScraper scraper = new HyperlinkSheetScraper(sheetPart.getInputStream());
- scraper.parse();
+ try (InputStream stream = sheetPart.getInputStream()) {
+ HyperlinkSheetScraper scraper = new HyperlinkSheetScraper(stream);
+ scraper.parse();
+ }
}
/**
Modified: poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java (original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/eventusermodel/XSSFBReader.java Tue Dec 28 02:42:29 2021
@@ -111,8 +111,9 @@ public class XSSFBReader extends XSSFRea
if(parts.size() == 0) return null;
// Create the Styles Table, and associate the Themes if present
- return new XSSFBStylesTable(parts.get(0).getInputStream());
-
+ try (InputStream stream = parts.get(0).getInputStream()) {
+ return new XSSFBStylesTable(stream);
+ }
}
public static class SheetIterator extends XSSFReader.SheetIterator {
@@ -133,9 +134,11 @@ public class XSSFBReader extends XSSFRea
@Override
protected Iterator<XSSFSheetRef> createSheetIteratorFromWB(PackagePart wb) throws IOException {
- SheetRefLoader sheetRefLoader = new SheetRefLoader(wb.getInputStream());
- sheetRefLoader.parse();
- return sheetRefLoader.getSheets().iterator();
+ try (InputStream stream = wb.getInputStream()) {
+ SheetRefLoader sheetRefLoader = new SheetRefLoader(stream);
+ sheetRefLoader.parse();
+ return sheetRefLoader.getSheets().iterator();
+ }
}
/**
Modified: poi/trunk/poi/src/test/java9/module-info.class
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java9/module-info.class?rev=1896463&r1=1896462&r2=1896463&view=diff
==============================================================================
Binary files - no diff available.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org