Repository: brooklyn-server Updated Branches: refs/heads/master 1068d905b -> 3d650c96b
Fix Streams.copyClose: actually close the streams Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/c51afd7e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/c51afd7e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/c51afd7e Branch: refs/heads/master Commit: c51afd7e9873b1b1ba0fe7e5bbb947be904891c4 Parents: 1068d90 Author: Aled Sage <[email protected]> Authored: Fri Sep 1 18:40:18 2017 +0100 Committer: Aled Sage <[email protected]> Committed: Fri Sep 1 18:40:18 2017 +0100 ---------------------------------------------------------------------- .../src/main/java/org/apache/brooklyn/util/stream/Streams.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/c51afd7e/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java ---------------------------------------------------------------------- diff --git a/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java b/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java index a703dba..ccfa1cc 100644 --- a/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java +++ b/utils/common/src/main/java/org/apache/brooklyn/util/stream/Streams.java @@ -159,10 +159,9 @@ public class Streams { public static void copyClose(InputStream input, OutputStream output) { try { copy(input, output); - } catch (RuntimeException e) { + } finally { closeQuietly(input); closeQuietly(output); - throw e; } }
