Repository: hbase Updated Branches: refs/heads/master 4ca4cd856 -> 3de0c6310
HBASE-16035 Nested AutoCloseables might not all get closed (Sean Mackrory) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/3de0c631 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/3de0c631 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/3de0c631 Branch: refs/heads/master Commit: 3de0c631050ea7dfb72fa8e1430aa8e7c0e87088 Parents: 4ca4cd8 Author: tedyu <yuzhih...@gmail.com> Authored: Mon Jun 20 16:25:50 2016 -0700 Committer: tedyu <yuzhih...@gmail.com> Committed: Mon Jun 20 16:25:50 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/http/log/LogLevel.java | 6 +++--- .../main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/3de0c631/hbase-server/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java index 1a95c70..1d674b4 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/http/log/LogLevel.java @@ -72,9 +72,9 @@ public class LogLevel { System.out.println("Connecting to " + url); URLConnection connection = url.openConnection(); connection.connect(); - try (BufferedReader in = new BufferedReader(new InputStreamReader( - connection.getInputStream()))) { - for(String line; (line = in.readLine()) != null; ) { + try (InputStreamReader streamReader = new InputStreamReader(connection.getInputStream()); + BufferedReader bufferedReader = new BufferedReader(streamReader)) { + for(String line; (line = bufferedReader.readLine()) != null; ) { if (line.startsWith(MARKER)) { System.out.println(TAG.matcher(line).replaceAll("")); } http://git-wip-us.apache.org/repos/asf/hbase/blob/3de0c631/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java index cf334db..7d0216a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/JarFinder.java @@ -124,8 +124,9 @@ public class JarFinder { jarDir)); } } - try (JarOutputStream zos = new JarOutputStream(new FileOutputStream(jarFile))) { - jarDir(dir, "", zos); + try (FileOutputStream fos = new FileOutputStream(jarFile); + JarOutputStream jos = new JarOutputStream(fos)) { + jarDir(dir, "", jos); } }
