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

recover fatal error

Browse Source
This commit is contained in:
高铁
2019-08-20 21:36:11 +08:00
parent 22e962b17c
commit 3943006477
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.1.20_preview_07</version>
<version>1.1.20_preview_08</version>
<packaging>jar</packaging>
<name>druid</name>
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+4 -1
View File
@@ -1691,6 +1691,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
public void handleConnectionException(DruidPooledConnection pooledConnection, Throwable t, String sql) throws SQLException {
final DruidConnectionHolder holder = pooledConnection.getConnectionHolder();
if (holder == null) {
return;
}
errorCountUpdater.incrementAndGet(this);
lastError = t;
@@ -2998,7 +3001,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
DruidConnectionHolder connection = connections[i];
if (onFatalError || fatalErrorIncrement > 0) {
if (lastFatalErrorTimeMillis < connection.lastActiveTimeMillis) {
if (lastFatalErrorTimeMillis > connection.lastActiveTimeMillis) {
keepAliveConnections[keepAliveCount++] = connection;
continue;
} else {
src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
+1
View File
@@ -147,6 +147,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
public void closePoolableStatement(DruidPooledPreparedStatement stmt) throws SQLException {
PreparedStatement rawStatement = stmt.getRawPreparedStatement();
final DruidConnectionHolder holder = this.holder;
if (holder == null) {
return;
}
src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
+3 -2
View File
@@ -98,8 +98,9 @@ public class DruidPooledStatement extends PoolableWrapper implements Statement {
DruidDataSource dataSource = null;
if (this.conn.holder.dataSource instanceof DruidDataSource) {
dataSource = (DruidDataSource) this.conn.holder.dataSource;
final DruidConnectionHolder holder = this.conn.holder;
if (holder.dataSource instanceof DruidDataSource) {
dataSource = (DruidDataSource) holder.dataSource;
}
if (dataSource == null) {
return;