From 610c27fe84fc6a048ec85cf75eaa9c353aa17cfb Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <destiny.lin@fanruan.com>
Date: Tue, 9 Jul 2024 16:46:52 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-126587=20FBP=E9=80=82=E9=85=8D=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95-=E8=AE=BE=E8=AE=A1=E5=99=A8-=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=86=85=E7=BD=AE=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=99=A8=E7=9B=B8=E5=85=B3=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/fr/design/env/HttpWorkspaceConnector.java | 2 ++
 .../src/main/java/com/fr/env/handler/impl/CancelHandler.java    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
index 27d6258bd0..f45964508c 100644
--- a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
+++ b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java
@@ -1,6 +1,7 @@
 package com.fr.design.env;
 
 import com.fanruan.workplace.http.HttpConstants;
+import com.fanruan.workplace.http.RepositoryManager;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 import com.fr.workspace.server.repository.compatible.register.CompatibleRegister;
@@ -64,6 +65,7 @@ public class HttpWorkspaceConnector implements WorkspaceConnector {
         }
         client.startHeartBeat();
         CompatibleRegister.registerCompatibleEnv();
+        RepositoryManager.getInstance().clearLastPool();
         return client;
     }
 
diff --git a/designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java b/designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java
index 140d0ec136..cd7f737eec 100644
--- a/designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java
+++ b/designer-base/src/main/java/com/fr/env/handler/impl/CancelHandler.java
@@ -1,5 +1,6 @@
 package com.fr.env.handler.impl;
 
+import com.fanruan.workplace.http.RepositoryManager;
 import com.fr.env.handler.Handler;
 import com.fr.env.handler.RefWrapper;
 import com.fr.env.handler.ResultWrapper;
@@ -17,6 +18,7 @@ public class CancelHandler implements Handler<RefWrapper, ResultWrapper> {
     @Override
     public ResultWrapper handle(RefWrapper wrapper) {
         Throwable e = wrapper.getThrowable();
+        RepositoryManager.getInstance().rollBack();
         return new ResultWrapper(!(e instanceof CancellationException), e);
     }
 }