From 47aa53fa72ab7bebfcf16bcfe9a63b873cbcbc18 Mon Sep 17 00:00:00 2001
From: qiye <jianliang5669@gmail.com>
Date: Thu, 19 Jan 2023 15:13:21 +0800
Subject: [PATCH] [fix](multi-catalog)switching catalogs after dropping will
 get NPE. (#16067)

Issue Number: close #16066
---
 fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
index 213ab7d7e6..3b33e7d50d 100755
--- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
@@ -4357,7 +4357,10 @@ public class Env {
 
         String currentDB = ctx.getDatabase();
         if (StringUtils.isNotEmpty(currentDB)) {
-            catalogMgr.addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB);
+            // When dropped the current catalog in current context, the current catalog will be null.
+            if (ctx.getCurrentCatalog() != null) {
+                catalogMgr.addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB);
+            }
         }
         ctx.changeDefaultCatalog(catalogName);
         String lastDb = catalogMgr.getLastDB(catalogName);