From ad6e7887ad07b29f620c4e60a9a392e3eb6344b1 Mon Sep 17 00:00:00 2001
From: wangxiangyu <wangxiangyu@360shuke.com>
Date: Tue, 14 Nov 2023 22:19:24 +0800
Subject: [PATCH] [Fix](multi-catalog) Fix NPE when replaying hms events.

---
 .../main/java/org/apache/doris/qe/MasterCatalogExecutor.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java
index 7fd3322d60b88b..316bca897f8dea 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/MasterCatalogExecutor.java
@@ -63,7 +63,7 @@ public void forward(long catalogId, long dbId) throws Exception {
         boolean isReturnToPool = false;
         try {
             TInitExternalCtlMetaResult result = client.initExternalCtlMeta(request);
-            ConnectContext.get().getEnv().getJournalObservable().waitOn(result.maxJournalId, waitTimeoutMs);
+            Env.getCurrentEnv().getJournalObservable().waitOn(result.maxJournalId, waitTimeoutMs);
             isReturnToPool = true;
         } catch (Exception e) {
             LOG.warn("Failed to finish forward init operation, please try again. ", e);