Merge branch 'keyword-search-prototype' of https://github.com/sleuthkit/autopsy into keyword-search-prototype

This commit is contained in:
adam-m 2012-01-11 11:23:03 -05:00
commit ad818c4078
2 changed files with 1 additions and 3 deletions

View File

@ -200,7 +200,7 @@ class AddImageWizardPanel1 implements WizardDescriptor.Panel<WizardDescriptor>,
Logger logger = Logger.getLogger(AddImageWizardPanel1.class.getName()); Logger logger = Logger.getLogger(AddImageWizardPanel1.class.getName());
logger.log(Level.WARNING, "Error cleaning up image task", ex); logger.log(Level.WARNING, "Error cleaning up image task", ex);
}finally{ }finally{
settings.putProperty(AddImageAction.IMAGECLEANUPTASK_PROP, null); cleanupTask.disable();
} }
} }

View File

@ -171,8 +171,6 @@ class AddImageWizardPanel3 implements WizardDescriptor.Panel<WizardDescriptor> {
*/ */
@Override @Override
public void storeSettings(WizardDescriptor settings) { public void storeSettings(WizardDescriptor settings) {
// Cancel all cleanup tasks
settings.putProperty(AddImageAction.IMAGECLEANUPTASK_PROP, null);
} }