Repository: cassandra Updated Branches: refs/heads/trunk c3d10abc7 -> 52d09eaa7
make sure streams get closed Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/52d09eaa Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/52d09eaa Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/52d09eaa Branch: refs/heads/trunk Commit: 52d09eaa7b7f6707902dd2db9816a24730af5f9f Parents: c3d10ab Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Sep 14 22:25:01 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Sep 14 22:25:01 2014 -0400 ---------------------------------------------------------------------- .../org/apache/cassandra/utils/FBUtilities.java | 25 +++++++++++--------- 1 file changed, 14 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/52d09eaa/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index 5e248bf..1634fa4 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -591,17 +591,20 @@ public class FBUtilities int errCode = p.waitFor(); if (errCode != 0) { - BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream())); - BufferedReader err = new BufferedReader(new InputStreamReader(p.getErrorStream())); - StringBuilder sb = new StringBuilder(); - String str; - while ((str = in.readLine()) != null) - sb.append(str).append(System.getProperty("line.separator")); - while ((str = err.readLine()) != null) - sb.append(str).append(System.getProperty("line.separator")); - throw new IOException("Exception while executing the command: "+ StringUtils.join(pb.command(), " ") + - ", command error Code: " + errCode + - ", command output: "+ sb.toString()); + try (BufferedReader in = new BufferedReader(new InputStreamReader(p.getInputStream())); + BufferedReader err = new BufferedReader(new InputStreamReader(p.getErrorStream()))) + { + String lineSep = System.getProperty("line.separator"); + StringBuilder sb = new StringBuilder(); + String str; + while ((str = in.readLine()) != null) + sb.append(str).append(lineSep); + while ((str = err.readLine()) != null) + sb.append(str).append(lineSep); + throw new IOException("Exception while executing the command: "+ StringUtils.join(pb.command(), " ") + + ", command error Code: " + errCode + + ", command output: "+ sb.toString()); + } } } catch (InterruptedException e)
