fuhouyin/dynamic-datasource
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use java7 compile

Browse Source
This commit is contained in:
huayanYu 2023-07-18 22:10:36 +08:00
parent 07f490a5d1
commit a37ed90c80
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dynamic-datasource-creator/src/main/java/com/baomidou/dynamic/datasource/toolkit/ConfigMergeCreator.java
View File

@ -45,6 +45,7 @@ public class ConfigMergeCreator<C, T> {
private final Class<T> targetClazz; private final Class<T> targetClazz;
@SneakyThrows @SneakyThrows
@SuppressWarnings("unchecked")
public T create(C global, C item) { public T create(C global, C item) {
if (configClazz.equals(targetClazz) && global == null) { if (configClazz.equals(targetClazz) && global == null) {
return (T) item; return (T) item;

10
dynamic-datasource-spring/src/main/java/com/baomidou/dynamic/datasource/tx/ConnectionFactory.java
View File

@ -221,7 +221,15 @@ public class ConnectionFactory {
public static boolean hasSavepoint(String xid) { public static boolean hasSavepoint(String xid) {
Map<String, List<SavePointHolder>> savePointMap = SAVEPOINT_CONNECTION_HOLDER.get(); Map<String, List<SavePointHolder>> savePointMap = SAVEPOINT_CONNECTION_HOLDER.get();
List<SavePointHolder> savePointHolders = savePointMap.get(xid); List<SavePointHolder> savePointHolders = savePointMap.get(xid);
return !CollectionUtils.isEmpty(savePointHolders) && savePointHolders.stream().anyMatch(savePointHolder -> !CollectionUtils.isEmpty(savePointHolder.getSavePoints())); if (savePointHolders == null || savePointHolders.isEmpty()) {
return false;
}
for (SavePointHolder savePointHolder : savePointHolders) {
if (!CollectionUtils.isEmpty(savePointHolder.getSavePoints())) {
return true;
}
}
return false;
} }
} }