Author: fanningpj
Date: Sat Nov 20 12:53:20 2021
New Revision: 1895197
URL: http://svn.apache.org/viewvc?rev=1895197&view=rev
Log:
use try block to close output streams
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/EncryptedTempFilePackagePart.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/TempFilePackagePart.java
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java?rev=1895197&r1=1895196&r2=1895197&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/dev/OOXMLPrettyPrint.java
Sat Nov 20 12:53:20 2021
@@ -16,11 +16,7 @@
==================================================================== */
package org.apache.poi.ooxml.dev;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
+import java.io.*;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
@@ -47,7 +43,7 @@ import org.xml.sax.InputSource;
* Reads a zipped OOXML file and produces a copy with the included
* pretty-printed XML files.
*
- * This is useful for comparing OOXML files produced by different tools as
the often
+ * This is useful for comparing OOXML files produced by different tools as
they often
* use different formatting of the XML.
*/
public class OOXMLPrettyPrint {
@@ -108,7 +104,9 @@ public class OOXMLPrettyPrint {
pretty(document, out, 2);
} else {
System.out.println("Not pretty-printing non-XML file " +
name);
- IOUtils.copy(file.getInputStream(entry), out);
+ try (InputStream in = file.getInputStream(entry)) {
+ IOUtils.copy(in, out);
+ }
}
} catch (Exception e) {
throw new IOException("While handling entry " + name, e);
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java?rev=1895197&r1=1895196&r2=1895197&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/ooxml/util/PackageHelper.java
Sat Nov 20 12:53:20 2021
@@ -73,8 +73,11 @@ public final class PackageHelper {
dest.addRelationship(part.getPartName(), rel.getTargetMode(),
rel.getRelationshipType());
part_tgt = dest.createPart(part.getPartName(),
part.getContentType());
- try (OutputStream out = part_tgt.getOutputStream()) {
- IOUtils.copy(part.getInputStream(), out);
+ try (
+ InputStream in = part.getInputStream();
+ OutputStream out = part_tgt.getOutputStream()
+ ) {
+ IOUtils.copy(in, out);
}
if (part.hasRelationships()) {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/EncryptedTempFilePackagePart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/EncryptedTempFilePackagePart.java?rev=1895197&r1=1895196&r2=1895197&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/EncryptedTempFilePackagePart.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/EncryptedTempFilePackagePart.java
Sat Nov 20 12:53:20 2021
@@ -118,9 +118,9 @@ public final class EncryptedTempFilePack
}
@Override
- public boolean load(InputStream ios) throws InvalidFormatException {
+ public boolean load(InputStream is) throws InvalidFormatException {
try (OutputStream os = getOutputStreamImpl()) {
- IOUtils.copy(ios, os);
+ IOUtils.copy(is, os);
} catch(IOException e) {
throw new InvalidFormatException(e.getMessage(), e);
}
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java?rev=1895197&r1=1895196&r2=1895197&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/MemoryPackagePart.java
Sat Nov 20 12:53:20 2021
@@ -112,10 +112,10 @@ public final class MemoryPackagePart ext
}
@Override
- public boolean load(InputStream ios) throws InvalidFormatException {
+ public boolean load(InputStream is) throws InvalidFormatException {
try (UnsynchronizedByteArrayOutputStream baos = new
UnsynchronizedByteArrayOutputStream()) {
// Grab the data
- IOUtils.copy(ios, baos);
+ IOUtils.copy(is, baos);
// Save it
data = baos.toByteArray();
} catch (IOException e) {
Modified:
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/TempFilePackagePart.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/TempFilePackagePart.java?rev=1895197&r1=1895196&r2=1895197&view=diff
==============================================================================
---
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/TempFilePackagePart.java
(original)
+++
poi/trunk/poi-ooxml/src/main/java/org/apache/poi/openxml4j/opc/internal/TempFilePackagePart.java
Sat Nov 20 12:53:20 2021
@@ -117,9 +117,9 @@ public final class TempFilePackagePart e
}
@Override
- public boolean load(InputStream ios) throws InvalidFormatException {
+ public boolean load(InputStream is) throws InvalidFormatException {
try (OutputStream os = getOutputStreamImpl()) {
- IOUtils.copy(ios, os);
+ IOUtils.copy(is, os);
} catch(IOException e) {
throw new InvalidFormatException(e.getMessage(), e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
