You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by mo...@apache.org on 2025/11/07 06:37:58 UTC
(doris) branch branch-3.1 updated: branch-3.1: [fix](catalog) fix iceberg catalog NPE issue #57696 (#57796)
This is an automated email from the ASF dual-hosted git repository.
morningman pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 25a6f5ad1c1 branch-3.1: [fix](catalog) fix iceberg catalog NPE issue #57696 (#57796)
25a6f5ad1c1 is described below
commit 25a6f5ad1c1e12ac6b9576ab70e2c76ebca2f5ae
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Fri Nov 7 14:37:51 2025 +0800
branch-3.1: [fix](catalog) fix iceberg catalog NPE issue #57696 (#57796)
Cherry-picked from #57696
Co-authored-by: lw112 <13...@users.noreply.github.com>
---
.../java/org/apache/doris/datasource/hive/HMSExternalCatalog.java | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
index ceb4755b2c5..0711775963e 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HMSExternalCatalog.java
@@ -155,9 +155,6 @@ public class HMSExternalCatalog extends ExternalCatalog {
@Override
public synchronized void resetToUninitialized(boolean invalidCache) {
super.resetToUninitialized(invalidCache);
- if (metadataOps != null) {
- metadataOps.close();
- }
}
@Override
@@ -166,8 +163,13 @@ public class HMSExternalCatalog extends ExternalCatalog {
if (null != fileSystemExecutor) {
fileSystemExecutor.shutdown();
}
+ if (null != metadataOps) {
+ metadataOps.close();
+ metadataOps = null;
+ }
if (null != icebergMetadataOps) {
icebergMetadataOps.close();
+ icebergMetadataOps = null;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org