admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
开源海哥 2023-08-03 16:32:33 +08:00
commit 4998646191
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/field/FieldQueryManager.java
View File

@ -111,6 +111,8 @@ public class FieldQueryManager {
} else if (fieldType == Set.class) { } else if (fieldType == Set.class) {
return Collections.emptySet(); return Collections.emptySet();
} }
// avoid NPE
return ClassUtil.newInstance(fieldType);
} }
if (ClassUtil.canInstance(fieldType.getModifiers())) { if (ClassUtil.canInstance(fieldType.getModifiers())) {

2
mybatis-flex-core/src/main/java/com/mybatisflex/core/util/DateUtil.java
View File

@ -41,7 +41,7 @@ public class DateUtil {
public static final String dateMillisecondPattern = "yyyy-MM-dd HH:mm:ss SSS"; public static final String dateMillisecondPattern = "yyyy-MM-dd HH:mm:ss SSS";
public static final String dateCSTPattern = "EEE MMM dd HH:mm:ss zzz yyyy"; public static final String dateCSTPattern = "EEE MMM dd HH:mm:ss zzz yyyy";
private static final ThreadLocal<HashMap<String, SimpleDateFormat>> TL = ThreadLocal.withInitial(() -> new HashMap<>()); private static final ThreadLocal<HashMap<String, SimpleDateFormat>> TL = ThreadLocal.withInitial(HashMap::new);
private static final Map<String, DateTimeFormatter> dateTimeFormatters = new ConcurrentHashMap<>(); private static final Map<String, DateTimeFormatter> dateTimeFormatters = new ConcurrentHashMap<>();