Revert "HDFS-12903. [READ] Fix closing streams in ImageWriter" This reverts commit c1bf2654b0e9118985b8518b0254eac4dd302a2f.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e515103a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e515103a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e515103a Branch: refs/heads/trunk Commit: e515103a83e12ad4908c0ca0b4b1aa4a87e2a840 Parents: 8239e3a Author: Chris Douglas <cdoug...@apache.org> Authored: Fri Dec 15 17:40:50 2017 -0800 Committer: Chris Douglas <cdoug...@apache.org> Committed: Fri Dec 15 17:51:42 2017 -0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e515103a/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java b/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java index 1be5190..14a5f8f 100644 --- a/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java +++ b/hadoop-tools/hadoop-fs2img/src/main/java/org/apache/hadoop/hdfs/server/namenode/ImageWriter.java @@ -183,9 +183,9 @@ public class ImageWriter implements Closeable { dirsTmp.deleteOnExit(); dirsTmpStream = new FileOutputStream(dirsTmp); dirs = beginSection(dirsTmpStream); - } catch (Throwable e) { + } catch (IOException e) { IOUtils.cleanupWithLogger(null, raw, dirsTmpStream); - throw new IOException(e); + throw e; } try { --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org