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

minor cleanup

Browse Source
This commit is contained in:
millmanorama 2019-03-21 17:31:40 +01:00
parent 69cc2df231
commit a2a3014867
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Core/src/org/sleuthkit/autopsy/coreutils/ExecUtil.java
View File

@ -116,12 +116,7 @@ public final class ExecUtil {
* @throws IOException if an I/O error occurs. * @throws IOException if an I/O error occurs.
*/ */
public static int execute(ProcessBuilder processBuilder) throws SecurityException, IOException { public static int execute(ProcessBuilder processBuilder) throws SecurityException, IOException {
return ExecUtil.execute(processBuilder, 30, TimeUnit.DAYS, new ProcessTerminator() { return ExecUtil.execute(processBuilder, 30, TimeUnit.DAYS, () -> false);
@Override
public boolean shouldTerminateProcess() {
return false;
}
});
} }
/** /**
@ -231,18 +226,29 @@ public final class ExecUtil {
process.destroyForcibly(); process.destroyForcibly();
} }
} catch (Exception ex) { } catch (Exception ex) {
logger.log(Level.WARNING, "Error occurred when attempting to kill process: {0}", ex.getMessage()); // NON-NLS Logger.getLogger(ExecUtil.class.getName()).log(Level.WARNING, "Error occurred when attempting to kill process: {0}", ex.getMessage()); // NON-NLS
} }
} }
/** /**
* EVERYTHING FOLLOWING THIS LINE IS DEPRECATED AND SLATED FOR REMOVAL * EVERYTHING FOLLOWING THIS LINE IS DEPRECATED AND SLATED FOR REMOVAL
*/ */
@Deprecated
private static final Logger logger = Logger.getLogger(ExecUtil.class.getName()); private static final Logger logger = Logger.getLogger(ExecUtil.class.getName());
@Deprecated
private Process proc = null; private Process proc = null;
@Deprecated
private ExecUtil.StreamToStringRedirect errorStringRedirect = null; private ExecUtil.StreamToStringRedirect errorStringRedirect = null;
@Deprecated
private ExecUtil.StreamToStringRedirect outputStringRedirect = null; private ExecUtil.StreamToStringRedirect outputStringRedirect = null;
@Deprecated
private ExecUtil.StreamToWriterRedirect outputWriterRedirect = null; private ExecUtil.StreamToWriterRedirect outputWriterRedirect = null;
@Deprecated
private int exitValue = -100; private int exitValue = -100;
/** /**

1
Core/src/org/sleuthkit/autopsy/modules/plaso/PlasoIngestModule.java
View File

@ -59,7 +59,6 @@ import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_DES
import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TL_EVENT_TYPE; import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_TL_EVENT_TYPE;
import org.sleuthkit.datamodel.Content; import org.sleuthkit.datamodel.Content;
import org.sleuthkit.datamodel.Image; import org.sleuthkit.datamodel.Image;
import org.sleuthkit.datamodel.SleuthkitCase;
import org.sleuthkit.datamodel.TimeUtilities; import org.sleuthkit.datamodel.TimeUtilities;
import org.sleuthkit.datamodel.TskCoreException; import org.sleuthkit.datamodel.TskCoreException;
import org.sleuthkit.datamodel.timeline.EventType; import org.sleuthkit.datamodel.timeline.EventType;