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

Merge pull request #106 from wenshao/master

Browse Source 
添加测试，修正executeQuery返回null时无法处理的bug。
This commit is contained in:
温高铁
2012-08-28 02:32:21 -07:00
parent 80a2da2973 d265c178c9
commit 92f11b712c
7 changed files with 184 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/filter/FilterEventAdapter.java
+8 -4
View File
@@ -301,8 +301,10 @@ public abstract class FilterEventAdapter extends FilterAdapter {
try {
ResultSetProxy resultSet = super.statement_executeQuery(chain, statement, sql);
statementExecuteQueryAfter(statement, sql, resultSet);
resultSetOpenAfter(resultSet);
if (resultSet != null) {
statementExecuteQueryAfter(statement, sql, resultSet);
resultSetOpenAfter(resultSet);
}
return resultSet;
} catch (SQLException error) {
@@ -462,9 +464,11 @@ public abstract class FilterEventAdapter extends FilterAdapter {
ResultSetProxy resultSet = chain.preparedStatement_executeQuery(statement);
statementExecuteQueryAfter(statement, statement.getSql(), resultSet);
if (resultSet != null) {
statementExecuteQueryAfter(statement, statement.getSql(), resultSet);
resultSetOpenAfter(resultSet);
resultSetOpenAfter(resultSet);
}
return resultSet;
} catch (SQLException error) {
src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java
+4
View File
@@ -180,6 +180,10 @@ public class DruidPooledPreparedStatement extends DruidPooledStatement implement
conn.beforeExecute();
try {
ResultSet rs = stmt.executeQuery();
if (rs == null) {
return null;
}
DruidPooledResultSet poolableResultSet = new DruidPooledResultSet(this, rs);
resultSetTrace.add(poolableResultSet);
src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
+4
View File
@@ -107,6 +107,10 @@ public class DruidPooledStatement extends PoolableWrapper implements Statement {
conn.beforeExecute();
try {
ResultSet rs = stmt.executeQuery(sql);
if (rs == null) {
return rs;
}
DruidPooledResultSet poolableResultSet = new DruidPooledResultSet(this, rs);
resultSetTrace.add(poolableResultSet);