From 1a8a97e7b8f2857df6ec15614bbdba6795b6eae7 Mon Sep 17 00:00:00 2001 From: Looly Date: Thu, 9 Mar 2023 20:51:23 +0800 Subject: [PATCH] fix code --- .../cn/hutool/crypto/GlobalBouncyCastleProvider.java | 2 +- .../src/main/java/cn/hutool/db/ds/DSFactory.java | 12 ++++++------ .../src/main/java/cn/hutool/poi/PoiChecker.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hutool-crypto/src/main/java/cn/hutool/crypto/GlobalBouncyCastleProvider.java b/hutool-crypto/src/main/java/cn/hutool/crypto/GlobalBouncyCastleProvider.java index 7c8d872b1..500b2558c 100644 --- a/hutool-crypto/src/main/java/cn/hutool/crypto/GlobalBouncyCastleProvider.java +++ b/hutool-crypto/src/main/java/cn/hutool/crypto/GlobalBouncyCastleProvider.java @@ -19,7 +19,7 @@ public enum GlobalBouncyCastleProvider { GlobalBouncyCastleProvider() { try { this.provider = ProviderFactory.createBouncyCastleProvider(); - } catch (final NoClassDefFoundError e) { + } catch (final NoClassDefFoundError | NoSuchMethodError e) { // ignore } } 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 36d518ab5..18a3a8656 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(final Setting setting) { try { return new HikariDSFactory(setting); - } catch (final NoClassDefFoundError e) { + } catch (final NoClassDefFoundError | NoSuchMethodError e) { // ignore } try { return new DruidDSFactory(setting); - } catch (final NoClassDefFoundError e) { + } catch (final NoClassDefFoundError | NoSuchMethodError e) { // ignore } try { return new TomcatDSFactory(setting); - } catch (final NoClassDefFoundError e) { + } catch (final NoClassDefFoundError | NoSuchMethodError e) { //如果未引入包，此处会报org.apache.tomcat.jdbc.pool.PoolConfiguration未找到错误 //因为org.apache.tomcat.jdbc.pool.DataSource实现了此接口，会首先检查接口的存在与否 // ignore } try { return new BeeDSFactory(setting); - } catch (final NoClassDefFoundError e) { + } catch (final NoClassDefFoundError | NoSuchMethodError e) { // ignore } try { return new DbcpDSFactory(setting); - } catch (final NoClassDefFoundError e) { + } catch (final NoClassDefFoundError | NoSuchMethodError e) { // ignore } try { return new C3p0DSFactory(setting); - } catch (final NoClassDefFoundError e) { + } catch (final 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 e93df4768..8c56b46a0 100644 --- a/hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java +++ b/hutool-poi/src/main/java/cn/hutool/poi/PoiChecker.java @@ -20,7 +20,7 @@ public class PoiChecker { public static void checkPoiImport() { try { Class.forName("org.apache.poi.ss.usermodel.Workbook", false, ClassLoaderUtil.getClassLoader()); - } catch (final ClassNotFoundException | NoClassDefFoundError e) { + } catch (final ClassNotFoundException | NoClassDefFoundError | NoSuchMethodError e) { throw new DependencyException(e, NO_POI_ERROR_MSG); } }