[hbase] branch branch-2.3 updated: HBASE-25646: Possible Resource Leak in CatalogJanitor #3036

[ps...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

psomogyi pushed a commit to branch branch-2.3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.3 by this push:
     new 82d872a  HBASE-25646: Possible Resource Leak in CatalogJanitor #3036
82d872a is described below

commit 82d872a2ed95cf8863224f3ece100826afdbc6bd
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.
    
    Co-authored-by: Peter Somogyi <ps...@apache.org>
    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>
---
 .../src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
index 33ba382..9adae94 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
@@ -773,9 +773,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 {