From 1d1b13c2f61857eaa813d007f61c0afee95b5289 Mon Sep 17 00:00:00 2001
From: pancx <p_lord@163.com>
Date: Wed, 15 Jan 2025 20:28:05 +0800
Subject: [PATCH] [#6236] fix(core): fix  possible resource leak in BaseCatalog

fix conflict.
---
 .../main/java/org/apache/gravitino/connector/BaseCatalog.java   | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java b/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java
index 508ccf9ca21..1b33a347243 100644
--- a/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java
+++ b/core/src/main/java/org/apache/gravitino/connector/BaseCatalog.java
@@ -209,6 +209,8 @@ public void initAuthorizationPluginInstance(IsolatedClassLoader classLoader) {
           }
           try (BaseAuthorization<?> authorization =
               BaseAuthorization.createAuthorization(classLoader, authorizationProvider)) {
+            // Load the authorization plugin with the class loader of the catalog.
+            // Because the JDBC authorization plugin may load JDBC driver using the class loader.
             authorizationPlugin =
                 classLoader.withClassLoader(
                     cl ->