From fdc58d0d35a95748d64ec24c10a52e9b1e306886 Mon Sep 17 00:00:00 2001
From: jmillman <jmillman@basistech.com>
Date: Thu, 11 Feb 2016 14:51:26 -0500
Subject: [PATCH] make sure to kill the progressHandle and timer even if
 exception is thrown, eg, when case is closed

handle exceptions better in  VideoUtils.generateVideoThumbnail()

update copyright dates

put cleanup code in finally block
---
 .../corecomponents/ThumbnailViewNode.java     | 12 +++++----
 .../autopsy/coreutils/VideoUtils.java         | 25 +++++++++----------
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
index dc06466d54..5ac5b95c67 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/ThumbnailViewNode.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2011 Basis Technology Corp.
+ * Copyright 2011-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -95,16 +95,18 @@ class ThumbnailViewNode extends FilterNode {
                         super.done();
                         try {
                             iconCache = new SoftReference<>(super.get());
-                            progressHandle.finish();
                             fireIconChange();
+                        } catch (InterruptedException | ExecutionException ex) {
+                            Logger.getLogger(ThumbnailViewNode.class.getName()).log(Level.SEVERE, "Error getting thumbnail icon", ex); //NON-NLS
+                        } finally {
+                            progressHandle.finish();
                             if (timer != null) {
                                 timer.stop();
                                 timer = null;
+
                             }
-                        } catch (InterruptedException | ExecutionException ex) {
-                            Logger.getLogger(ThumbnailViewNode.class.getName()).log(Level.SEVERE, "Error getting thumbnail icon", ex); //NON-NLS
+                            swingWorker = null;
                         }
-                        swingWorker = null;
                     }
                 };
                 swingWorker.execute();
diff --git a/Core/src/org/sleuthkit/autopsy/coreutils/VideoUtils.java b/Core/src/org/sleuthkit/autopsy/coreutils/VideoUtils.java
index dc06b75019..efa331c1dd 100644
--- a/Core/src/org/sleuthkit/autopsy/coreutils/VideoUtils.java
+++ b/Core/src/org/sleuthkit/autopsy/coreutils/VideoUtils.java
@@ -1,7 +1,7 @@
 /*
  * Autopsy Forensic Browser
  *
- * Copyright 2015 Basis Technology Corp.
+ * Copyright 2015-16 Basis Technology Corp.
  * Contact: carrier <at> sleuthkit <dot> org
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,6 +18,7 @@
  */
 package org.sleuthkit.autopsy.coreutils;
 
+import com.google.common.io.Files;
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.io.IOException;
@@ -94,20 +95,18 @@ public class VideoUtils {
     static BufferedImage generateVideoThumbnail(AbstractFile file, int iconSize) {
         java.io.File tempFile = getTempVideoFile(file);
 
-        try {
-            if (tempFile.exists() == false || tempFile.length() < file.getSize()) {
-                com.google.common.io.Files.createParentDirs(tempFile);
-                ProgressHandle progress = ProgressHandleFactory.createHandle(NbBundle.getMessage(VideoUtils.class, "VideoUtils.genVideoThumb.progress.text", file.getName()));
-                progress.start(100);
-                try {
-                    ContentUtils.writeToFile(file, tempFile, progress, null, true);
-                } catch (IOException ex) {
-                    LOGGER.log(Level.WARNING, "Error buffering file", ex); //NON-NLS
-                }
+        if (tempFile.exists() == false || tempFile.length() < file.getSize()) {
+            ProgressHandle progress = ProgressHandleFactory.createHandle(NbBundle.getMessage(VideoUtils.class, "VideoUtils.genVideoThumb.progress.text", file.getName()));
+            progress.start(100);
+            try {
+                Files.createParentDirs(tempFile);
+                ContentUtils.writeToFile(file, tempFile, progress, null, true);
+            } catch (IOException ex) {
+                LOGGER.log(Level.WARNING, "Error buffering file to disk", ex); //NON-NLS
+                return null;
+            } finally {
                 progress.finish();
             }
-        } catch (IOException ex) {
-            return null;
         }
 
         VideoCapture videoFile = new VideoCapture(); // will contain the video