Merge pull request #6623 in CORE/base-third from persist/11.0 to persist/jsy11

* commit 'cad875b91a014321efd92d02e40da2b87a8b240e':
  REPORT-76958 Druid获取连接的重试次数配置有bug
  REPORT-77015 Druid连接失败时抛出的报错不方便直接查看原因，10.0是可以的

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

@@ -1387,7 +1387,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                 || realDriverClassName.equals(JdbcConstants.POLARDB_DRIVER)) {
             this.validConnectionChecker = new PGValidConnectionChecker();
         } else if (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER)
-            || (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER2))) {
+                || (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER2))) {
             DbType dbType = DbType.of(this.dbTypeName);
             this.validConnectionChecker = new OceanBaseValidConnectionChecker(dbType);
         }
@@ -1482,7 +1482,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             try {
                 poolableConnection = getConnectionInternal(maxWaitMillis);
             } catch (GetConnectionTimeoutException ex) {
-                if (notFullTimeoutRetryCnt <= this.notFullTimeoutRetryCount && !isFull()) {
+                if (notFullTimeoutRetryCnt < this.notFullTimeoutRetryCount && !isFull()) {
                     notFullTimeoutRetryCnt++;
                     if (LOG.isWarnEnabled()) {
                         LOG.warn("get connection timeout retry : " + notFullTimeoutRetryCnt);
@@ -1830,7 +1830,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             String errorMessage = buf.toString();
 
             if (createError != null) {
-                throw new GetConnectionTimeoutException(errorMessage, createError);
+                if (createError instanceof SQLException) {
+                    throw (SQLException)createError;
+                } else {
+                    throw new GetConnectionTimeoutException(errorMessage, createError);
+                }
             } else {
                 throw new GetConnectionTimeoutException(errorMessage);
             }