From 8985ef1af9a88ef8dd90dd56229c20a870c4976c Mon Sep 17 00:00:00 2001
From: morningman <morningman@163.com>
Date: Tue, 28 May 2024 17:15:14 +0800
Subject: [PATCH] [fix](meta) fix catalog replay error

---
 .../src/main/java/org/apache/doris/catalog/ResourceMgr.java  | 5 +++++
 .../java/org/apache/doris/datasource/CatalogProperty.java    | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceMgr.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceMgr.java
index 93cb194c902202..e6fac7f07d81ad 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceMgr.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/ResourceMgr.java
@@ -163,6 +163,11 @@ public boolean containsResource(String name) {
     }
 
     public Resource getResource(String name) {
+        // nameToResource == null iff this is in replay thread
+        // just return null to ignore this.
+        if (nameToResource == null) {
+            return null;
+        }
         return nameToResource.get(name);
     }
 
diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogProperty.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogProperty.java
index 536ab74b282db5..50aea847e8f3bd 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogProperty.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogProperty.java
@@ -61,7 +61,7 @@ public CatalogProperty(String resource, Map<String, String> properties) {
     }
 
     private Resource catalogResource() {
-        if (catalogResource == null) {
+        if (!Strings.isNullOrEmpty(resource) && catalogResource == null) {
             synchronized (this) {
                 if (catalogResource == null) {
                     catalogResource = Env.getCurrentEnv().getResourceMgr().getResource(resource);