You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2016/05/29 04:32:30 UTC
hbase git commit: HBASE-15891. Closeable resources potentially not
getting closed if exception is thrown.
Repository: hbase
Updated Branches:
refs/heads/master 3b6e6e6c2 -> f4470af95
HBASE-15891. Closeable resources potentially not getting closed if exception is thrown.
Signed-off-by: stack <st...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f4470af9
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f4470af9
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f4470af9
Branch: refs/heads/master
Commit: f4470af95db383a47d1bd431a32cd8a6949dd7c0
Parents: 3b6e6e6
Author: Sean Mackrory <ma...@apache.org>
Authored: Wed May 25 07:20:14 2016 -0600
Committer: stack <st...@apache.org>
Committed: Sat May 28 21:32:22 2016 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/zookeeper/ZKUtil.java | 36 ++++++++++----------
.../hbase/util/CoprocessorClassLoader.java | 6 ++--
.../apache/hadoop/hbase/http/log/LogLevel.java | 14 ++++----
.../hadoop/hbase/mapreduce/JarFinder.java | 5 +--
4 files changed, 32 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f4470af9/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
index ae26400..f5b720e 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/zookeeper/ZKUtil.java
@@ -1926,27 +1926,27 @@ public class ZKUtil {
int port = sp.length > 1 ? Integer.parseInt(sp[1])
: HConstants.DEFAULT_ZOOKEPER_CLIENT_PORT;
- Socket socket = new Socket();
InetSocketAddress sockAddr = new InetSocketAddress(host, port);
- socket.connect(sockAddr, timeout);
-
- socket.setSoTimeout(timeout);
- PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
- BufferedReader in = new BufferedReader(new InputStreamReader(
- socket.getInputStream()));
- out.println("stat");
- out.flush();
- ArrayList<String> res = new ArrayList<String>();
- while (true) {
- String line = in.readLine();
- if (line != null) {
- res.add(line);
- } else {
- break;
+ try (Socket socket = new Socket()) {
+ socket.connect(sockAddr, timeout);
+
+ socket.setSoTimeout(timeout);
+ PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
+ BufferedReader in = new BufferedReader(new InputStreamReader(
+ socket.getInputStream()));
+ out.println("stat");
+ out.flush();
+ ArrayList<String> res = new ArrayList<String>();
+ while (true) {
+ String line = in.readLine();
+ if (line != null) {
+ res.add(line);
+ } else {
+ break;
+ }
}
+ return res.toArray(new String[res.size()]);
}
- socket.close();
- return res.toArray(new String[res.size()]);
}
private static void logRetrievedMsg(final ZooKeeperWatcher zkw,
http://git-wip-us.apache.org/repos/asf/hbase/blob/f4470af9/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java
----------------------------------------------------------------------
diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java
index 78ecc7e..11016c3 100644
--- a/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java
+++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/util/CoprocessorClassLoader.java
@@ -177,8 +177,10 @@ public class CoprocessorClassLoader extends ClassLoaderBase {
if (m.matches()) {
File file = new File(parentDirStr, "." + pathPrefix + "."
+ path.getName() + "." + System.currentTimeMillis() + "." + m.group(1));
- IOUtils.copyBytes(jarFile.getInputStream(entry),
- new FileOutputStream(file), conf, true);
+ try (FileOutputStream outStream = new FileOutputStream(file)) {
+ IOUtils.copyBytes(jarFile.getInputStream(entry),
+ outStream, conf, true);
+ }
file.deleteOnExit();
addURL(file.toURI().toURL());
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f4470af9/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 7701a25..1a95c70 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,14 +72,14 @@ public class LogLevel {
System.out.println("Connecting to " + url);
URLConnection connection = url.openConnection();
connection.connect();
-
- BufferedReader in = new BufferedReader(new InputStreamReader(
- connection.getInputStream()));
- for(String line; (line = in.readLine()) != null; )
- if (line.startsWith(MARKER)) {
- System.out.println(TAG.matcher(line).replaceAll(""));
+ try (BufferedReader in = new BufferedReader(new InputStreamReader(
+ connection.getInputStream()))) {
+ for(String line; (line = in.readLine()) != null; ) {
+ if (line.startsWith(MARKER)) {
+ System.out.println(TAG.matcher(line).replaceAll(""));
+ }
}
- in.close();
+ }
} catch (IOException ioe) {
System.err.println("" + ioe);
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/f4470af9/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 dfbe648..cf334db 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));
}
}
- JarOutputStream zos = new JarOutputStream(new FileOutputStream(jarFile));
- jarDir(dir, "", zos);
+ try (JarOutputStream zos = new JarOutputStream(new FileOutputStream(jarFile))) {
+ jarDir(dir, "", zos);
+ }
}
/**