codex-admin/autopsy
1
0
Fork 0
mirror of https://github.com/elisspace/autopsy.git synced 2026-09-04 06:50:00 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of https://github.com/sleuthkit/autopsy into 3562-ZipPasswordUse

Browse Source
This commit is contained in:
William Schaefer
2018-03-22 15:38:55 -04:00
parent 31153b60c8 f211e8aec9
commit ecbe953b97
4 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Core/src/org/sleuthkit/autopsy/casemodule/LocalFilesPanel.java
View File

@@ -191,6 +191,9 @@ final class LocalFilesPanel extends javax.swing.JPanel {
StringBuilder allPaths = new StringBuilder();
for (File f : files) {
currentFiles.add(f);
}
for (File f : currentFiles) {
//loop over set of all files to ensure list is accurate
//update label
allPaths.append(f.getAbsolutePath()).append("\n");
}

6
Core/src/org/sleuthkit/autopsy/ingest/DataSourceIngestJob.java
View File

@@ -524,7 +524,11 @@ final class DataSourceIngestJob {
DataSourceIngestJob.taskScheduler.scheduleDataSourceIngestTask(this);
} else {
logger.log(Level.INFO, "Scheduling file level analysis tasks for {0} (jobId={1}), no first stage data source level analysis configured", new Object[]{dataSource.getName(), this.id}); //NON-NLS
DataSourceIngestJob.taskScheduler.scheduleFileIngestTasks(this, this.files);
if (this.files.isEmpty()) {
DataSourceIngestJob.taskScheduler.scheduleFileIngestTasks(this);
} else {
DataSourceIngestJob.taskScheduler.scheduleFileIngestTasks(this, this.files);
}
/**
* No data source ingest task has been scheduled for this stage, and

25
Core/src/org/sleuthkit/autopsy/ingest/IngestTasksScheduler.java
View File

@@ -211,16 +211,23 @@ final class IngestTasksScheduler {
* method is adding derived files from a higher priority task that
* preceded the tasks currently in the queue.
*/
for (FileIngestTask newTask : newTasksForFileIngestThreads) {
try {
this.queuedAndRunningFileTasks.add(newTask);
this.fileTaskQueueForIngestThreads.addFirst(newTask);
} catch (InterruptedException ex) {
this.queuedAndRunningFileTasks.remove(newTask);
IngestTasksScheduler.logger.log(Level.INFO, "Ingest cancelled while blocked on a full file ingest threads queue", ex);
Thread.currentThread().interrupt();
break;
if (!newTasksForFileIngestThreads.isEmpty()) {
for (FileIngestTask newTask : newTasksForFileIngestThreads) {
try {
this.queuedAndRunningFileTasks.add(newTask);
this.fileTaskQueueForIngestThreads.addFirst(newTask);
} catch (InterruptedException ex) {
this.queuedAndRunningFileTasks.remove(newTask);
IngestTasksScheduler.logger.log(Level.INFO, "Ingest cancelled while blocked on a full file ingest threads queue", ex);
Thread.currentThread().interrupt();
break;
}
}
} else {
/*
* Only directory tasks were queued, so shuffle.
*/
this.shuffleFileTaskQueues();
}
}
}

2
ruleset.xml
View File

@@ -58,7 +58,7 @@
<!-- Disabled because we have lots of undocumented fields -->
<property name="fieldCommentRequirement" value="Ignored"/>
<!-- Disabled because we don't require comments on overrides of public fields -->
<property name="publicMethodCommentRequirement" value="Required"/>
<property name="publicMethodCommentRequirement" value="Ignored"/>
<!--<property name="methodWithOverrideCommentRequirement" value="Unwanted"/>-->
</properties>
</rule>