Author: fanningpj
Date: Sat Nov 20 13:51:00 2021
New Revision: 1895203
URL: http://svn.apache.org/viewvc?rev=1895203&view=rev
Log:
use try block to close input streams
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.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/xslf/util/PDFFormat.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java?rev=1895203&r1=1895202&r2=1895203&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/OPCPackage.java
Sat Nov 20 13:51:00 2021
@@ -464,8 +464,11 @@ public abstract class OPCPackage impleme
closeImpl();
}
} else if (this.output != null) {
- save(this.output);
- output.close();
+ try {
+ save(this.output);
+ } finally {
+ output.close();
+ }
}
// ensure all held resources are freed
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=1895203&r1=1895202&r2=1895203&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
Sat Nov 20 13:51:00 2021
@@ -182,9 +182,9 @@ public final class XSLFPictureData exten
}
public void setData(byte[] data) throws IOException {
- OutputStream os = getPackagePart().getOutputStream();
- os.write(data);
- os.close();
+ try (OutputStream os = getPackagePart().getOutputStream()) {
+ os.write(data);
+ }
// recalculate now since we already have the data bytes available
anyhow
checksum = IOUtils.calculateChecksum(data);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java?rev=1895203&r1=1895202&r2=1895203&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java
(original)
+++ poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xslf/util/PDFFormat.java
Sat Nov 20 13:51:00 2021
@@ -61,11 +61,14 @@ public class PDFFormat implements Output
@Override
public void writeSlide(MFProxy proxy, File outFile) throws IOException {
- pdfBoxGraphics2D.dispose();
+ try {
+ pdfBoxGraphics2D.dispose();
- PDFormXObject appearanceStream = pdfBoxGraphics2D.getXFormObject();
- contentStream.drawForm(appearanceStream);
- contentStream.close();
+ PDFormXObject appearanceStream = pdfBoxGraphics2D.getXFormObject();
+ contentStream.drawForm(appearanceStream);
+ } finally {
+ contentStream.close();
+ }
}
@Override
@@ -75,9 +78,12 @@ public class PDFFormat implements Output
@Override
public void close() throws IOException {
- document.close();
- if (fontTextDrawer != null) {
- fontTextDrawer.close();
+ try {
+ document.close();
+ } finally {
+ if (fontTextDrawer != null) {
+ fontTextDrawer.close();
+ }
}
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java?rev=1895203&r1=1895202&r2=1895203&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFBEventBasedExcelExtractor.java
Sat Nov 20 13:51:00 2021
@@ -115,28 +115,28 @@ public class XSSFBEventBasedExcelExtract
SheetTextExtractor sheetExtractor = new SheetTextExtractor();
XSSFBHyperlinksTable hyperlinksTable = null;
while (iter.hasNext()) {
- InputStream stream = iter.next();
- if (getIncludeSheetNames()) {
- text.append(iter.getSheetName());
- text.append('\n');
+ try (InputStream stream = iter.next()) {
+ if (getIncludeSheetNames()) {
+ text.append(iter.getSheetName());
+ text.append('\n');
+ }
+ if (handleHyperlinksInCells) {
+ hyperlinksTable = new
XSSFBHyperlinksTable(iter.getSheetPart());
+ }
+ XSSFBCommentsTable comments = getIncludeCellComments() ?
iter.getXSSFBSheetComments() : null;
+ processSheet(sheetExtractor, styles, comments, strings,
stream);
+ if (getIncludeHeadersFooters()) {
+ sheetExtractor.appendHeaderText(text);
+ }
+ sheetExtractor.appendCellText(text);
+ if (getIncludeTextBoxes()) {
+ processShapes(iter.getShapes(), text);
+ }
+ if (getIncludeHeadersFooters()) {
+ sheetExtractor.appendFooterText(text);
+ }
+ sheetExtractor.reset();
}
- if (handleHyperlinksInCells) {
- hyperlinksTable = new
XSSFBHyperlinksTable(iter.getSheetPart());
- }
- XSSFBCommentsTable comments = getIncludeCellComments() ?
iter.getXSSFBSheetComments() : null;
- processSheet(sheetExtractor, styles, comments, strings,
stream);
- if (getIncludeHeadersFooters()) {
- sheetExtractor.appendHeaderText(text);
- }
- sheetExtractor.appendCellText(text);
- if (getIncludeTextBoxes()) {
- processShapes(iter.getShapes(), text);
- }
- if (getIncludeHeadersFooters()) {
- sheetExtractor.appendFooterText(text);
- }
- sheetExtractor.reset();
- stream.close();
}
return text.toString();
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java?rev=1895203&r1=1895202&r2=1895203&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/xssf/extractor/XSSFEventBasedExcelExtractor.java
Sat Nov 20 13:51:00 2021
@@ -267,25 +267,25 @@ public class XSSFEventBasedExcelExtracto
SheetTextExtractor sheetExtractor = new SheetTextExtractor();
while (iter.hasNext()) {
- InputStream stream = iter.next();
- if (includeSheetNames) {
- text.append(iter.getSheetName());
- text.append('\n');
+ try (InputStream stream = iter.next()) {
+ if (includeSheetNames) {
+ text.append(iter.getSheetName());
+ text.append('\n');
+ }
+ Comments comments = includeCellComments ?
iter.getSheetComments() : null;
+ processSheet(sheetExtractor, styles, comments, strings,
stream);
+ if (includeHeadersFooters) {
+ sheetExtractor.appendHeaderText(text);
+ }
+ sheetExtractor.appendCellText(text);
+ if (includeTextBoxes) {
+ processShapes(iter.getShapes(), text);
+ }
+ if (includeHeadersFooters) {
+ sheetExtractor.appendFooterText(text);
+ }
+ sheetExtractor.reset();
}
- Comments comments = includeCellComments ?
iter.getSheetComments() : null;
- processSheet(sheetExtractor, styles, comments, strings,
stream);
- if (includeHeadersFooters) {
- sheetExtractor.appendHeaderText(text);
- }
- sheetExtractor.appendCellText(text);
- if (includeTextBoxes) {
- processShapes(iter.getShapes(), text);
- }
- if (includeHeadersFooters) {
- sheetExtractor.appendFooterText(text);
- }
- sheetExtractor.reset();
- stream.close();
}
return text.toString();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
