From adf11737f094dcc70ca3a5dbcf800225a581651e Mon Sep 17 00:00:00 2001
From: zhangdong <493738387@qq.com>
Date: Tue, 16 Jul 2024 20:22:47 +0800
Subject: [PATCH] =?UTF-8?q?[fix](catalog)Fix=20internal=20program=20error?=
 =?UTF-8?q?=20causing=20client=20to=20get=20stuck=20=E2=80=A6=20(#37821)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

…(#37551)

pick: https://github.com/apache/doris/pull/37551
---
 .../main/java/org/apache/doris/datasource/CatalogFactory.java   | 2 +-
 .../src/main/java/org/apache/doris/mysql/ReadListener.java      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java
index 23558ce576..fdd3b8fbe0 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java
@@ -153,7 +153,7 @@ public class CatalogFactory {
             // If failed, it will throw exception and the catalog will not be created.
             try {
                 catalog.initAccessController(true);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 LOG.warn("Failed to init access controller", e);
                 throw new DdlException("Failed to init access controller: " + e.getMessage());
             }
diff --git a/fe/fe-core/src/main/java/org/apache/doris/mysql/ReadListener.java b/fe/fe-core/src/main/java/org/apache/doris/mysql/ReadListener.java
index 2de6f80f05..c43954a98b 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/mysql/ReadListener.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/mysql/ReadListener.java
@@ -56,7 +56,7 @@ public class ReadListener implements ChannelListener<ConduitStreamSourceChannel>
                     ctx.stopAcceptQuery();
                     ctx.cleanup();
                 }
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 LOG.warn("Exception happened in one session(" + ctx + ").", e);
                 ctx.setKilled();
                 ctx.cleanup();