From aba1489aeebc07ba3614022fee23bb7177d1d7b9 Mon Sep 17 00:00:00 2001
From: William Schaefer <wschaefer@basistech.net>
Date: Tue, 17 Jul 2018 10:43:33 -0400
Subject: [PATCH] 4037 Close InputStream in object detection module which was
 left open

---
 .../ObjectDetectectionFileIngestModule.java           | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java b/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java
index d6bef92ab8..86a35dce23 100644
--- a/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java
+++ b/Experimental/src/org/sleuthkit/autopsy/experimental/objectdetection/ObjectDetectectionFileIngestModule.java
@@ -101,7 +101,7 @@ public class ObjectDetectectionFileIngestModule extends FileIngestModuleAdapter
     public ProcessResult process(AbstractFile file) {
         if (!classifiers.isEmpty() && ImageUtils.isImageThumbnailSupported(file)) {
             //Any image we can create a thumbnail for is one we should apply the classifiers to
-            InputStream inputStream = new ReadContentInputStream(file);
+            InputStream inputStream = new ReadContentInputStream(file);          
             byte[] imageInMemory;
             try {
                 imageInMemory = IOUtils.toByteArray(inputStream);
@@ -109,6 +109,15 @@ public class ObjectDetectectionFileIngestModule extends FileIngestModuleAdapter
                 logger.log(Level.WARNING, "Unable to read image to byte array for performing object detection on " + file.getParentPath() + file.getName() + " with object id of " + file.getId(), ex);
                 return IngestModule.ProcessResult.ERROR;
             }
+            finally {
+                try {
+                    inputStream.close();
+                } catch (IOException ex) {
+                   logger.log(Level.SEVERE, "Unable to close input stream after attempting to create byte array for " + file.getParentPath() + file.getName() + " with object id of " + file.getId(), ex);
+                   return IngestModule.ProcessResult.ERROR;
+                }
+            } 
+                
             Mat originalImage;
             try {
                 originalImage = Highgui.imdecode(new MatOfByte(imageInMemory), Highgui.IMREAD_GRAYSCALE);