Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
DigitalSonic
2020-02-06 21:11:20 +08:00
parent 5e0dc32798 18606b51c7
commit a48c2fd493
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java
+1
View File
@@ -42,6 +42,7 @@ public class DruidSpringAopConfiguration {
}
@Bean
@ConditionalOnProperty(name = "spring.aop.auto",havingValue = "false")
public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() {
DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
advisorAutoProxyCreator.setProxyTargetClass(true);
pom.xml
+1 -1
View File
@@ -8,7 +8,7 @@
<packaging>jar</packaging>
<name>druid</name>
<description>An JDBC datasource implementation.</description>
<description>A JDBC datasource implementation.</description>
<url>https://github.com/alibaba/druid</url>
<inceptionYear>2013</inceptionYear>
src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+1 -1
View File
@@ -795,7 +795,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
LOG.error("maxEvictableIdleTimeMillis should be greater than 30000");
}
if (maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) {
if (inited && maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) {
throw new IllegalArgumentException("maxEvictableIdleTimeMillis must be grater than minEvictableIdleTimeMillis");
}