Permalink
Browse files

Merge branch 'master' into native-clamp

  • Loading branch information...
LadyCailin committed Jan 18, 2019
2 parents 94088bb + 24154e6 commit 268d3aa480a04955b2fcc33e81f2416f95a6a0bd
@@ -113,13 +113,13 @@ public CommandExecutor start() throws IOException {
if(out != null) {
out.flush();
}
} catch(IOException ex) {
} catch (IOException ex) {
Logger.getLogger(CommandExecutor.class.getName()).log(Level.SEVERE, null, ex);
} finally {
if(out != null) {
try {
out.close();
} catch(IOException ex) {
} catch (IOException ex) {
Logger.getLogger(CommandExecutor.class.getName()).log(Level.SEVERE, null, ex);
}
}
@@ -137,13 +137,13 @@ public CommandExecutor start() throws IOException {
if(err != null) {
err.flush();
}
} catch(IOException ex) {
} catch (IOException ex) {
Logger.getLogger(CommandExecutor.class.getName()).log(Level.SEVERE, null, ex);
} finally {
if(err != null) {
try {
err.close();
} catch(IOException ex) {
} catch (IOException ex) {
Logger.getLogger(CommandExecutor.class.getName()).log(Level.SEVERE, null, ex);
}
}
@@ -166,12 +166,12 @@ public CommandExecutor start() throws IOException {
}
try {
Thread.sleep(10);
} catch(InterruptedException ex) {
} catch (InterruptedException ex) {
// Will pick up in the while loop.
inThread.interrupt();
}
}
} catch(IOException ex) {
} catch (IOException ex) {
Logger.getLogger(CommandExecutor.class.getName()).log(Level.SEVERE, null, ex);
}
}, Arrays.toString(args) + "-input");
@@ -260,14 +260,14 @@ public int waitFor() throws InterruptedException {
if(out != null) {
try {
out.flush();
} catch(IOException ex) {
} catch (IOException ex) {
Logger.getLogger(CommandExecutor.class.getName()).log(Level.SEVERE, null, ex);
}
}
if(err != null) {
try {
err.flush();
} catch(IOException ex) {
} catch (IOException ex) {
Logger.getLogger(CommandExecutor.class.getName()).log(Level.SEVERE, null, ex);
}
}
@@ -984,7 +984,7 @@ public static void main(String[] args) throws Exception {
System.exit(1);
}
System.exit(0);
} catch(Exception e) {
} catch (Exception e) {
e.printStackTrace(System.err);
}

0 comments on commit 268d3aa

Please sign in to comment.