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 dd8992e  #7549, No statements may be issued when any streaming result 
sets are open (#7555)
dd8992e is described below

commit dd8992eaaa4b3996dc6e247560ee40c5de12fe11
Author: Zhang Yonglun <[email protected]>
AuthorDate: Tue Sep 22 16:37:47 2020 +0800

    #7549, No statements may be issued when any streaming result sets are open 
(#7555)
---
 .../shardingsphere/proxy/frontend/command/CommandExecutorTask.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
index 1d5735c..3443e02 100644
--- 
a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
+++ 
b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-core/src/main/java/org/apache/shardingsphere/proxy/frontend/command/CommandExecutorTask.java
@@ -80,14 +80,14 @@ public final class CommandExecutorTask implements Runnable {
             // CHECKSTYLE:ON
             processException(ex);
         } finally {
+            Collection<SQLException> exceptions = closeExecutionResources();
             if (isNeedFlush) {
                 context.flush();
             }
             if 
(!backendConnection.getTransactionStatus().isInConnectionHeldTransaction()) {
-                Collection<SQLException> exceptions = 
closeExecutionResources();
                 exceptions.addAll(backendConnection.closeConnections(false));
-                processClosedExceptions(exceptions);
             }
+            processClosedExceptions(exceptions);
             rootInvokeHook.finish(connectionSize);
         }
     }

Reply via email to