diff --git a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java index fc9d68b001..b22dda4b02 100644 --- a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java +++ b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java @@ -90,6 +90,10 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM } public void configFromProperties(Properties properties) { + if (properties == null) { + return; + } + { String prop = properties.getProperty("druid.log.conn"); if ("false".equals(prop)) { diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java index dc365a34d9..0c0b42e7d0 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceStatLoggerImpl.java @@ -46,6 +46,10 @@ public class DruidDataSourceStatLoggerImpl extends DruidDataSourceStatLoggerAdap */ @Override public void configFromProperties(Properties properties) { + if (properties == null) { + return; + } + String property = properties.getProperty("druid.stat.loggerName"); if (property != null && property.length() > 0) { setLoggerName(property); diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java index a22e627e4c..5faa3d9f36 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlValidConnectionChecker.java @@ -68,6 +68,10 @@ public class MySqlValidConnectionChecker extends ValidConnectionCheckerAdapter i @Override public void configFromProperties(Properties properties) { + if (properties == null) { + return; + } + String property = properties.getProperty("druid.mysql.usePingMethod"); if ("true".equals(property)) { setUsePingMethod(true); diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseOracleExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseOracleExceptionSorter.java index 6cdeac49be..dcc67d18ac 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseOracleExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OceanBaseOracleExceptionSorter.java @@ -22,6 +22,10 @@ public class OceanBaseOracleExceptionSorter extends OracleExceptionSorter { } public void configFromProperties(Properties properties) { + if (properties == null) { + return; + } + String property = properties.getProperty("druid.oracle.fatalErrorCodes"); if (property != null) { String[] items = property.split("\\,"); diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java index 5c2e73964d..ba4e803969 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java @@ -42,6 +42,10 @@ public class OracleExceptionSorter implements ExceptionSorter, Serializable { } public void configFromProperties(Properties properties) { + if (properties == null) { + return; + } + String property = properties.getProperty("druid.oracle.fatalErrorCodes"); if (property != null) { String[] items = property.split("\\,"); diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java index c3138fa947..60435e1943 100644 --- a/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java +++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleValidConnectionChecker.java @@ -42,6 +42,10 @@ public class OracleValidConnectionChecker extends ValidConnectionCheckerAdapter @Override public void configFromProperties(Properties properties) { + if (properties == null) { + return; + } + String property = properties.getProperty("druid.oracle.pingTimeout"); if (property != null && property.length() > 0) { int value = Integer.parseInt(property); diff --git a/src/main/java/com/alibaba/druid/wall/WallProviderStatLoggerImpl.java b/src/main/java/com/alibaba/druid/wall/WallProviderStatLoggerImpl.java index 093b82f18f..5609408ec0 100644 --- a/src/main/java/com/alibaba/druid/wall/WallProviderStatLoggerImpl.java +++ b/src/main/java/com/alibaba/druid/wall/WallProviderStatLoggerImpl.java @@ -30,6 +30,10 @@ public class WallProviderStatLoggerImpl extends WallProviderStatLoggerAdapter im @Override public void configFromProperties(Properties properties) { + if (properties == null) { + return; + } + String property = properties.getProperty("druid.stat.loggerName"); if (property != null && property.length() > 0) { setLoggerName(property);