resolve conflict for mysql 8.0

FinVolution · Mar 15, 2021 · 027eea6 · 027eea6
1 parent 4906821
commit 027eea6
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 81 deletions.
diff --git a/das-client/src/main/java/com/ppdai/das/core/datasource/SingleDataSource.java b/das-client/src/main/java/com/ppdai/das/core/datasource/SingleDataSource.java
@@ -22,8 +22,6 @@
 import com.ppdai.das.core.configure.DataSourceConfigure;
 import com.ppdai.das.core.configure.DataSourceConfigureConstants;
 import com.ppdai.das.core.datasource.tomcat.DalTomcatDataSource;
-import com.ppdai.das.core.helper.ConnectionPhantomReferenceCleaner;
-import com.ppdai.das.core.helper.DefaultConnectionPhantomReferenceCleaner;
 import com.ppdai.das.core.helper.PoolPropertiesHelper;
 import com.ppdai.das.core.helper.ServiceLoaderHelper;
 import com.ppdai.das.core.log.Callback;
@@ -41,7 +39,6 @@ public class SingleDataSource implements DataSourceConfigureConstants {
     private static final String DATASOURCE_CREATE_DATASOURCE = "DataSource::createDataSource:%s";
     private static ILogger ilogger = ServiceLoaderHelper.getInstance(ILogger.class, DefaultLoggerImpl.class);
 
-    private static ConnectionPhantomReferenceCleaner connectionPhantomReferenceCleaner = new DefaultConnectionPhantomReferenceCleaner();
     private static AtomicBoolean containsMySQL=new AtomicBoolean(false);
     private static final String MYSQL_URL_PREFIX = "jdbc:mysql://";
     public static final String JMX_TOMCAT_DATASOURCE = "TomcatDataSource";
@@ -90,7 +87,6 @@ public void execute() throws Exception {
         try {
             if (!containsMySQL.get()) {
                 if (dataSourceConfigure.getConnectionUrl().startsWith(MYSQL_URL_PREFIX)){
-                    connectionPhantomReferenceCleaner.start();
                     containsMySQL.set(true);
                 }
             }

diff --git a/...ent/src/main/java/com/ppdai/das/core/helper/DefaultConnectionPhantomReferenceCleaner.java b/...ent/src/main/java/com/ppdai/das/core/helper/DefaultConnectionPhantomReferenceCleaner.java