[shardingsphere] branch master updated: Adjust resource closing order when channel inactive (#10534)

[zhangliang]

This is an automated email from the ASF dual-hosted git repository.

zhangliang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 9a2253a  Adjust resource closing order when channel inactive (#10534)
9a2253a is described below

commit 9a2253aa9208737f628b1634ef581f43056e92c7
Author: 吴伟杰 <wuwei...@apache.org>
AuthorDate: Fri May 28 20:37:22 2021 +0800

    Adjust resource closing order when channel inactive (#10534)
---
 .../proxy/frontend/netty/FrontendChannelInboundHandler.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
index 1082eaf..76908f0 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/netty/FrontendChannelInboundHandler.java
@@ -92,12 +92,12 @@ public final class FrontendChannelInboundHandler extends 
ChannelInboundHandlerAd
     }
     
     private void closeAllResources() {
+        
ConnectionThreadExecutorGroup.getInstance().unregisterAndAwaitTermination(backendConnection.getConnectionId());
         PrimaryVisitedManager.clear();
         backendConnection.closeResultSets();
         backendConnection.closeStatements();
         backendConnection.closeConnections(true);
         backendConnection.closeCalciteExecutor();
-        
ConnectionThreadExecutorGroup.getInstance().unregisterAndAwaitTermination(backendConnection.getConnectionId());
         databaseProtocolFrontendEngine.release(backendConnection);
     }