use try block to close input streams

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1895202 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
index 3e821f17a01be5ed912f146fd622cc4f91998a9f..56ce16e10ac609035ac7f5e0783efd140b3f23c5 100644 (file)
--- a/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
+++ b/poi/src/main/java/org/apache/poi/poifs/crypt/cryptoapi/CryptoAPIEncryptor.java
@@ -143,9 +143,9 @@ public class CryptoAPIEncryptor extends Encryptor {
             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);

diff --git a/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java b/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
index 098555cb4f84e198c21d7a37ea45628dae569ddb..14bd636e840c907b9fbffcd96f2f016b7457701c 100644 (file)
--- a/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
+++ b/poi/src/main/java/org/apache/poi/sl/draw/BitmapImageRenderer.java
@@ -85,11 +85,12 @@ public class BitmapImageRenderer implements ImageRenderer {
     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);
     }