Browse Source

Pull request #6456: REPORT-77015 Druid连接失败时抛出的报错不方便直接查看原因,10.0是可以的

Merge in CORE/base-third from ~MAXIMUS/base-third:release/11.0 to release/11.0

* commit 'c80c28153a62f9be5e1d1c1dc098cd523b8a0080':
  REPORT-77015 Druid连接失败时抛出的报错不方便直接查看原因,10.0是可以的
release/11.0
Maximus 2 years ago
parent
commit
8ceac60097
  1. 8
      fine-druid/src/main/java/com/fr/third/alibaba/druid/pool/DruidDataSource.java

8
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)) { || realDriverClassName.equals(JdbcConstants.POLARDB_DRIVER)) {
this.validConnectionChecker = new PGValidConnectionChecker(); this.validConnectionChecker = new PGValidConnectionChecker();
} else if (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER) } else if (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER)
|| (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER2))) { || (realDriverClassName.equals(JdbcConstants.OCEANBASE_DRIVER2))) {
DbType dbType = DbType.of(this.dbTypeName); DbType dbType = DbType.of(this.dbTypeName);
this.validConnectionChecker = new OceanBaseValidConnectionChecker(dbType); this.validConnectionChecker = new OceanBaseValidConnectionChecker(dbType);
} }
@ -1830,7 +1830,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
String errorMessage = buf.toString(); String errorMessage = buf.toString();
if (createError != null) { if (createError != null) {
throw new GetConnectionTimeoutException(errorMessage, createError); if (createError instanceof SQLException) {
throw (SQLException)createError;
} else {
throw new GetConnectionTimeoutException(errorMessage, createError);
}
} else { } else {
throw new GetConnectionTimeoutException(errorMessage); throw new GetConnectionTimeoutException(errorMessage);
} }

Loading…
Cancel
Save