mstoeck3/autopsy-flatpak
1
0
Fork 0
mirror of https://github.com/overcuriousity/autopsy-flatpak.git synced 2025-07-15 01:07:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/sleuthkit/autopsy

Browse Source
This commit is contained in:
Alex Ebadirad 2012-06-12 09:22:23 -07:00
commit 1abf48dccc
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Ingest/src/org/sleuthkit/autopsy/ingest/IngestManager.java
View File

@ -314,6 +314,14 @@ public class IngestManager {
for (IngestImageThread imageWorker : toStop) { for (IngestImageThread imageWorker : toStop) {
IngestServiceImage s = imageWorker.getService(); 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)) { if (isServiceRunning(s)) {
try { try {
imageWorker.getService().stop(); imageWorker.getService().stop();
@ -321,10 +329,7 @@ public class IngestManager {
logger.log(Level.WARNING, "Exception while stopping service: " + s.getName(), e); 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"); logger.log(Level.INFO, "stopped all");

5
docs/doxygen/Doxyfile
View File

@ -690,7 +690,7 @@ INPUT_ENCODING = UTF-8
# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py # *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
# *.f90 *.f *.for *.vhd *.vhdl # *.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 # 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. # 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 # 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. # 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 # When a file name is specified after GENERATE_TAGFILE, doxygen will create
# a tag file that is based on the input files it reads. # a tag file that is based on the input files it reads.