diff --git a/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java b/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java index c389b280e..183cb58e2 100644 --- a/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java +++ b/hutool-db/src/main/java/cn/hutool/db/ds/DSFactory.java @@ -154,34 +154,34 @@ public abstract class DSFactory implements Closeable, Serializable{ private static DSFactory doCreate(Setting setting) { try { return new HikariDSFactory(setting); - } catch (NoClassDefFoundError e) { + } catch (NoClassDefFoundError | NoSuchMethodError e) { // ignore } try { return new DruidDSFactory(setting); - } catch (NoClassDefFoundError e) { + } catch (NoClassDefFoundError | NoSuchMethodError e) { // ignore } try { return new TomcatDSFactory(setting); - } catch (NoClassDefFoundError e) { + } catch (NoClassDefFoundError | NoSuchMethodError e) { //如果未引入包,此处会报org.apache.tomcat.jdbc.pool.PoolConfiguration未找到错误 //因为org.apache.tomcat.jdbc.pool.DataSource实现了此接口,会首先检查接口的存在与否 // ignore } try { return new BeeDSFactory(setting); - } catch (NoClassDefFoundError e) { + } catch (NoClassDefFoundError | NoSuchMethodError e) { // ignore } try { return new DbcpDSFactory(setting); - } catch (NoClassDefFoundError e) { + } catch (NoClassDefFoundError | NoSuchMethodError e) { // ignore } try { return new C3p0DSFactory(setting); - } catch (NoClassDefFoundError e) { + } catch (NoClassDefFoundError | NoSuchMethodError e) { // ignore } return new PooledDSFactory(setting); diff --git a/hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java b/hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java index 1d0fff88a..ea4f9f3aa 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java @@ -5,7 +5,7 @@ import cn.hutool.core.util.ClassLoaderUtil; /** * POI引入检查器 - * + * * @author looly * @since 4.0.10 */ @@ -20,7 +20,7 @@ public class PoiChecker { public static void checkPoiImport() { try { Class.forName("org.apache.poi.ss.usermodel.Workbook", false, ClassLoaderUtil.getClassLoader()); - } catch (ClassNotFoundException | NoClassDefFoundError e) { + } catch (ClassNotFoundException | NoClassDefFoundError | NoSuchMethodError e) { throw new DependencyException(e, NO_POI_ERROR_MSG); } }