topjohnwu/libsu
1
0
Fork 0
mirror of https://github.com/topjohnwu/libsu.git synced 2024-10-07 01:03:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly handle shell check errors

Browse Source
This commit is contained in:
topjohnwu 2020-07-23 23:11:01 -07:00
parent 7cac36171f
commit c6dcd22612
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/main/java/com/topjohnwu/superuser/internal/ShellImpl.java
View File

@ -113,23 +113,25 @@ class ShellImpl extends Shell {
// Shell checks might get stuck indefinitely
Future<Void> check = executor.submit(this::shellCheck);
try {
check.get(timeout, TimeUnit.SECONDS);
} catch (ExecutionException e) {
Throwable cause = e.getCause();
if (cause instanceof IOException) {
throw (IOException) cause;
} else {
throw new IOException("Unknown ExecutionException", cause);
try {
check.get(timeout, TimeUnit.SECONDS);
} catch (ExecutionException e) {
Throwable cause = e.getCause();
if (cause instanceof IOException) {
throw (IOException) cause;
} else {
throw new IOException("Unknown ExecutionException", cause);
}
} catch (TimeoutException e) {
throw new IOException("Shell timeout", e);
} catch (InterruptedException e) {
throw new IOException("Shell initialization interrupted", e);
}
} catch (TimeoutException e) {
throw new IOException("Shell timeout", e);
} catch (InterruptedException e) {
throw new IOException("Shell initialization interrupted", e);
} finally {
} catch (IOException e) {
executor.shutdownNow();
release();
throw e;
}
}