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

2267 added logging message for interrupted waitFor in ExecUtil

Browse Source
This commit is contained in:
William Schaefer 2017-03-01 14:53:35 -05:00
parent 0cbdde4ad8
commit 2ea84fa7a0
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,6 +163,11 @@ public final class ExecUtil {
process.waitFor(timeOut, units); process.waitFor(timeOut, units);
if (process.isAlive() && terminator.shouldTerminateProcess()) { if (process.isAlive() && terminator.shouldTerminateProcess()) {
killProcess(process); killProcess(process);
try {
process.waitFor(); //waiting to help ensure process is shutdown before calling interrupt() or returning
} catch (InterruptedException exx) {
Logger.getLogger(ExecUtil.class.getName()).log(Level.INFO, String.format("Wait for process termination following killProcess was interrupted for command %s", processBuilder.command().get(0)));
}
} }
} while (process.isAlive()); } while (process.isAlive());
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
@ -172,6 +177,7 @@ public final class ExecUtil {
try { try {
process.waitFor(); //waiting to help ensure process is shutdown before calling interrupt() or returning process.waitFor(); //waiting to help ensure process is shutdown before calling interrupt() or returning
} catch (InterruptedException exx) { } catch (InterruptedException exx) {
Logger.getLogger(ExecUtil.class.getName()).log(Level.INFO, String.format("Wait for process termination following killProcess was interrupted for command %s", processBuilder.command().get(0)));
} }
Logger.getLogger(ExecUtil.class.getName()).log(Level.INFO, "Thread interrupted while running {0}", processBuilder.command().get(0)); // NON-NLS Logger.getLogger(ExecUtil.class.getName()).log(Level.INFO, "Thread interrupted while running {0}", processBuilder.command().get(0)); // NON-NLS
Thread.currentThread().interrupt(); Thread.currentThread().interrupt();