From a396a4207dede8e7e44b1aabcfe22db0b98aa1cb Mon Sep 17 00:00:00 2001
From: Brian Carrier <carrier@sleuthkit.org>
Date: Mon, 11 Jun 2012 18:28:36 -0400
Subject: [PATCH 1/2] updated doxygen

---
 docs/doxygen/Doxyfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/doxygen/Doxyfile b/docs/doxygen/Doxyfile
index 8691e42e5d..9808239a10 100644
--- a/docs/doxygen/Doxyfile
+++ b/docs/doxygen/Doxyfile
@@ -690,7 +690,7 @@ INPUT_ENCODING         = UTF-8
 # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
 # *.f90 *.f *.for *.vhd *.vhdl
 
-FILE_PATTERNS          = *.java
+FILE_PATTERNS          = *.java *.dox
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.
@@ -1561,7 +1561,8 @@ SKIP_FUNCTION_MACROS   = YES
 # NOT include the path). If a tag file is not located in the directory in which
 # doxygen is run, you must also specify the path to the tagfile here.
 
-TAGFILES               = qtools_docs/qtools.tag=../../qtools_docs/html
+#TAGFILES               = $(TSK_HOME)/tskjni_doxygen.tag=http://www.sleuthkit.org/sleuthkit/docs/jni-docs
+# Adding that in, gives lots of errors and the class list goes away....
 
 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
 # a tag file that is based on the input files it reads.

From 6d5156201775e62958a7737510cd25cd4a2ae5c5 Mon Sep 17 00:00:00 2001
From: adam-m <amalinowski@basistech.com>
Date: Tue, 12 Jun 2012 10:29:56 -0400
Subject: [PATCH 2/2] Better cancellation of image services threads from ingest
 manager if interruption occurs

---
 .../org/sleuthkit/autopsy/ingest/IngestManager.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
index 484bccc3b7..90f2a5ce90 100755
--- a/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
+++ b/Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
@@ -314,6 +314,14 @@ public class IngestManager {
 
         for (IngestImageThread imageWorker : toStop) {
             IngestServiceImage s = imageWorker.getService();
+            
+            //stop the worker thread if thread is running
+            boolean cancelled = imageWorker.cancel(true);
+            if (!cancelled) {
+                logger.log(Level.INFO, "Unable to cancel image ingest worker for service: " + imageWorker.getService().getName() + " img: " + imageWorker.getImage().getName());
+            }
+            
+            //stop notification to service to cleanup resources
             if (isServiceRunning(s)) {
                 try {
                     imageWorker.getService().stop();
@@ -321,10 +329,7 @@ public class IngestManager {
                     logger.log(Level.WARNING, "Exception while stopping service: " + s.getName(), e);
                 }
             }
-            boolean cancelled = imageWorker.cancel(true);
-            if (!cancelled) {
-                logger.log(Level.WARNING, "Unable to cancel image ingest worker for service: " + imageWorker.getService().getName() + " img: " + imageWorker.getImage().getName());
-            }
+           
         }
 
         logger.log(Level.INFO, "stopped all");