Merge pull request #6212 in CORE/base-third from final/11.0 to persist/11.0

* commit '3831d7eda03f96724afa4b9b2f4ef9ff265abe0d':
  REPORT-74418 informix等老驱动未实现部分Connection接口导致druid创建线程退出
  REPORT-74418 informix等老驱动未实现部分Connection接口导致druid创建线程退出
  REPORT-74418 informix等老驱动未实现部分Connection接口导致druid创建线程退出

fine-druid/readme.MD

@@ -8,11 +8,12 @@
 
 > 由于需要适配数据源的一些特性和默认配置，对Druid有部分修改，后续更新都要保留下列修改
 
-| 版本    | 日期         | FineReport变动                                                                        |
+| 版本    | 日期         | 任务编号 | FineReport变动                                                                    |
-|-------|------------|-------------------------------------------------------------------------------------|
+|-------|------------|----|------------------------------------------------------------------------------------|
-| 1.2.9 | 2022-04-27 | DruidAbstractDataSource.testConnectionInternal()判断timeBetweenEvictionRunsMillis > 0 |
+| 1.2.9 | 2022-04-27 |    |DruidAbstractDataSource.testConnectionInternal()判断timeBetweenEvictionRunsMillis > 0 |
-| 1.2.9 | 2022-04-27 | MysqlUtils.getLastPacketReceivedTimeMs添加驱动判断                                        |
+| 1.2.9 | 2022-04-27 |    |MysqlUtils.getLastPacketReceivedTimeMs添加驱动判断                                       |
-| 1.2.9 | 2022-05-05 | MysqlUtils.getLastPacketReceivedTimeMs根据类加载器区分连接实现等，不在使用全局变量                        |
+| 1.2.9 | 2022-05-05 |    |MysqlUtils.getLastPacketReceivedTimeMs根据类加载器区分连接实现等，不在使用全局变量                       |
-| 1.2.9 | 2022-05-05 | com.fr.third.alibaba.druid.util.Utils.loadClass改为优先从线程类加载器加载类                       |
+| 1.2.9 | 2022-05-05 |    | com.fr.third.alibaba.druid.util.Utils.loadClass改为优先从线程类加载器加载类 |
-| 1.2.9 | 2022-05-05 | 恢复com.fr.third.alibaba.druid.pool.DruidDataSourceFactory对hibernate配置属性的支持           |
+| 1.2.9 | 2022-05-05 |    |恢复com.fr.third.alibaba.druid.pool.DruidDataSourceFactory对hibernate配置属性的支持          |
-| 1.2.9 | 2022-05-10 | 恢复DruidDataSource中的创建线程启停机制                                                         |
+| 1.2.9 | 2022-05-10 |    |恢复DruidDataSource中的创建线程启停机制                                                        |
+| 1.2.9 | 2022-06-27 | REPORT-74418 |DruidConnectionHolder初始化时捕获AbstractMethodError异常防止获取getHoldability错误导致创建线程退出       |

fine-druid/src/main/java/com/fr/third/alibaba/druid/pool/DruidConnectionHolder.java

@@ -15,34 +15,36 @@
  */
 package com.fr.third.alibaba.druid.pool;
 
+import com.fr.third.alibaba.druid.DbType;
+import com.fr.third.alibaba.druid.pool.DruidAbstractDataSource.PhysicalConnectionInfo;
+import com.fr.third.alibaba.druid.proxy.jdbc.WrapperProxy;
+import com.fr.third.alibaba.druid.support.logging.Log;
+import com.fr.third.alibaba.druid.support.logging.LogFactory;
+import com.fr.third.alibaba.druid.util.JdbcUtils;
+import com.fr.third.alibaba.druid.util.Utils;
+
+import javax.sql.ConnectionEventListener;
+import javax.sql.StatementEventListener;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.locks.ReentrantLock;
 
-import javax.sql.ConnectionEventListener;
-import javax.sql.StatementEventListener;
-
-import com.fr.third.alibaba.druid.DbType;
-import com.fr.third.alibaba.druid.pool.DruidAbstractDataSource.PhysicalConnectionInfo;
-import com.fr.third.alibaba.druid.proxy.jdbc.WrapperProxy;
-import com.fr.third.alibaba.druid.support.logging.Log;
-import com.fr.third.alibaba.druid.support.logging.LogFactory;
-import com.fr.third.alibaba.druid.util.JdbcConstants;
-import com.fr.third.alibaba.druid.util.JdbcUtils;
-import com.fr.third.alibaba.druid.util.Utils;
-
 /**
  * @author wenshao [szujobs@hotmail.com]
  */
 public final class DruidConnectionHolder {
     private final static Log LOG = LogFactory.getLog(DruidConnectionHolder.class);
+
+    static Set<DbType> holdabilityUnsupportedDbTypes = new HashSet<>(Arrays.asList(DbType.sybase, DbType.db2, DbType.hive, DbType.odps));
     public static boolean holdabilityUnsupported = false;
 
     protected final DruidAbstractDataSource dataSource;
@@ -103,54 +105,46 @@ public final class DruidConnectionHolder {
         this.lastActiveTimeMillis = connectTimeMillis;
         this.lastExecTimeMillis = connectTimeMillis;
 
-        this.underlyingAutoCommit = conn.getAutoCommit();
-
         if (conn instanceof WrapperProxy) {
             this.connectionId = ((WrapperProxy) conn).getId();
         } else {
             this.connectionId = dataSource.createConnectionId();
         }
 
-        {
+
-            boolean initUnderlyHoldability = !holdabilityUnsupported;
+        // 下面是一些驱动的默认值，reset时用到
+
+        // autoCommit
+        this.underlyingAutoCommit = conn.getAutoCommit();
+
+        // holdability
         DbType dbType = DbType.of(dataSource.dbTypeName);
-            if (dbType == DbType.sybase //
+        boolean initUnderlyingHoldability = !holdabilityUnsupported;
-                    || dbType == DbType.db2 //
+        if (holdabilityUnsupportedDbTypes.contains(dbType)) {
-                    || dbType == DbType.hive //
+            initUnderlyingHoldability = false;
-                    || dbType == DbType.odps //
+        }
-            ) {
+
-                initUnderlyHoldability = false;
+        if (initUnderlyingHoldability) {
-            }
-            if (initUnderlyHoldability) {
             try {
                 this.underlyingHoldability = conn.getHoldability();
-                } catch (UnsupportedOperationException e) {
+            } catch (Throwable e) {
                 holdabilityUnsupported = true;
-                    LOG.warn("getHoldability unsupported", e);
-                } catch (SQLFeatureNotSupportedException e) {
-                    holdabilityUnsupported = true;
-                    LOG.warn("getHoldability unsupported", e);
-                } catch (SQLException e) {
-                    // bug fixed for hive jdbc-driver
-                    if ("Method not supported".equals(e.getMessage())) {
-                        holdabilityUnsupported = true;
-                    }
                 LOG.warn("getHoldability error", e);
             }
         }
-        }
 
+        // readOnly
+        try {
             this.underlyingReadOnly = conn.isReadOnly();
+        } catch (Throwable e) {
+            LOG.warn("isReadOnly error", e);
+        }
+
+        // transactionIsolation
         try {
             this.underlyingTransactionIsolation = conn.getTransactionIsolation();
-        } catch (SQLException e) {
+        } catch (Throwable e) {
-            // compartible for alibaba corba
+            LOG.warn("getTransactionIsolation error", e);
-            if ("HY000".equals(e.getSQLState())
-                    || "com.mysql.jdbc.exceptions.jdbc4.MySQLSyntaxErrorException".equals(e.getClass().getName())) {
-                // skip
-            } else {
-                throw e;
-            }
         }
 
         this.defaultHoldability = underlyingHoldability;