From 3de0c631050ea7dfb72fa8e1430aa8e7c0e87088 Mon Sep 17 00:00:00 2001
From: tedyu <yuzhihong@gmail.com>
Date: Mon, 20 Jun 2016 16:25:50 -0700
Subject: [PATCH] HBASE-16035 Nested AutoCloseables might not all get closed
 (Sean Mackrory)

---
 .../java/org/apache/hadoop/hbase/http/log/LogLevel.java     | 6 +++---
 .../java/org/apache/hadoop/hbase/mapreduce/JarFinder.java   | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

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 1a95c7014d6..1d674b45b29 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(""));
           }
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 cf334dba045..7d0216a00bd 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);
     }
   }