diff --git a/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java index 5576baae4fad61c48fc4e2261886e82c1990c0d6..95652b0921ae5ed8b2dfafc40f2e92702bdcca61 100644 --- a/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java +++ b/easy-trans-service/src/main/java/org/dromara/trans/service/impl/ITransTypeService.java @@ -293,13 +293,13 @@ public interface ITransTypeService { } CompletableFuture> cf = CompletableFuture.supplyAsync(() -> { try { - if (!StringUtil.isEmpty(dataSourceName)) { - TransConfig.dataSourceSetter.setDataSource(dataSourceName); - } + TransConfig.dataSourceSetter.setDataSource(dataSourceName); return callable.call(); } catch (Exception e) { Logger.error("", e); - } + } finally { + TransConfig.dataSourceSetter.clear(dataSourceName); + } return null; }); try { @@ -331,14 +331,14 @@ public interface ITransTypeService { Map context = TransConfig.dataSourceSetter.getContext(); CompletableFuture cf = CompletableFuture.supplyAsync(() -> { try { - if (!StringUtil.isEmpty(dataSourceName)) { TransConfig.dataSourceSetter.setDataSource(dataSourceName); TransConfig.dataSourceSetter.setContext(context); - } return callable.call(); } catch (Exception e) { Logger.error("", e); - } + } finally { + TransConfig.dataSourceSetter.clear(dataSourceName); + } return null; }); try {