You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bh...@apache.org on 2021/03/09 17:36:20 UTC
[hbase] branch branch-2.4 updated: HBASE-25646: Possible Resource
Leak in CatalogJanitor #3036
This is an automated email from the ASF dual-hosted git repository.
bharathv pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 4a0b3cc HBASE-25646: Possible Resource Leak in CatalogJanitor #3036
4a0b3cc is described below
commit 4a0b3cc7246b6ee0e3dab5a67b5b8d0276e80fdb
Author: Narges Shadab <54...@users.noreply.github.com>
AuthorDate: Tue Mar 9 09:07:02 2021 -0800
HBASE-25646: Possible Resource Leak in CatalogJanitor #3036
Close the stream using a try-with-resources block.
Reviewed-by: Aman Poonia <am...@gmail.com>
Signed-off-by: Wei-Chiu Chuang <we...@apache.org>
Signed-off-by: Viraj Jasani <vj...@apache.org>
Signed-off-by: Bharath Vissapragada <bh...@apache.org>
(cherry picked from commit 573daed419e381dd9cfd115f459cb5237d8b0740)
---
.../java/org/apache/hadoop/hbase/master/janitor/CatalogJanitor.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/janitor/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/janitor/CatalogJanitor.java
index 0a23db6..f0189ad 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/janitor/CatalogJanitor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/janitor/CatalogJanitor.java
@@ -406,9 +406,8 @@ public class CatalogJanitor extends ScheduledChore {
private static void checkLog4jProperties() {
String filename = "log4j.properties";
- try {
- final InputStream inStream =
- CatalogJanitor.class.getClassLoader().getResourceAsStream(filename);
+ try (final InputStream inStream =
+ CatalogJanitor.class.getClassLoader().getResourceAsStream(filename)) {
if (inStream != null) {
new Properties().load(inStream);
} else {