Author: fanningpj
Date: Sat Nov 20 13:43:27 2021
New Revision: 1895202
URL: http://svn.apache.org/viewvc?rev=1895202&view=rev
Log:
use try block to close input streams
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java?rev=1895202&r1=1895201&r2=1895202&view=diff
==============================================================================
---
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
(original)
+++
poi/trunk/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
Sat Nov 20 13:43:27 2021
@@ -143,9 +143,9 @@ public class CryptoAPIEncryptor extends
descEntry.reserved2 = 0;
bos.setBlock(block);
- DocumentInputStream dis = dir.createDocumentInputStream(entry);
- IOUtils.copy(dis, bos);
- dis.close();
+ try (DocumentInputStream dis =
dir.createDocumentInputStream(entry)) {
+ IOUtils.copy(dis, bos);
+ }
descEntry.streamSize = bos.size() - descEntry.streamOffset;
descList.add(descEntry);
Modified:
poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
URL:
http://svn.apache.org/viewvc/poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java?rev=1895202&r1=1895201&r2=1895202&view=diff
==============================================================================
--- poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
(original)
+++ poi/trunk/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
Sat Nov 20 13:43:27 2021
@@ -85,11 +85,12 @@ public class BitmapImageRenderer impleme
public void loadImage(InputStream data, String contentType) throws
IOException {
InputStream in = data;
if (doCache) {
- UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream();
- IOUtils.copy(data, bos);
- cachedImage = bos.toByteArray();
- cachedContentType = contentType;
- in = bos.toInputStream();
+ try (UnsynchronizedByteArrayOutputStream bos = new
UnsynchronizedByteArrayOutputStream()) {
+ IOUtils.copy(data, bos);
+ cachedImage = bos.toByteArray();
+ cachedContentType = contentType;
+ in = bos.toInputStream();
+ }
}
img = readImage(in, contentType);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
