From acc9371b8bc6c4b2031fd0abe4c7d0643c9499b9 Mon Sep 17 00:00:00 2001
From: Daniel Liu <139250065@qq.com>
Date: Thu, 5 Feb 2026 18:43:28 +0800
Subject: [PATCH] fix(node): fix HTTP server always force closing #25755
 (#1998)

---
 node/rpcstack.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/node/rpcstack.go b/node/rpcstack.go
index 701a96f651..61cd3ed0db 100644
--- a/node/rpcstack.go
+++ b/node/rpcstack.go
@@ -276,13 +276,15 @@ func (h *httpServer) doStop() {
 		h.wsHandler.Store((*rpcHandler)(nil))
 		wsHandler.server.Stop()
 	}
+
 	ctx, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
 	defer cancel()
 	err := h.server.Shutdown(ctx)
-	if err == ctx.Err() {
+	if err != nil && err == ctx.Err() {
 		h.log.Warn("HTTP server graceful shutdown timed out")
 		h.server.Close()
 	}
+
 	h.listener.Close()
 	h.log.Info("HTTP server stopped", "endpoint", h.listener.Addr())