You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2005/06/25 06:46:29 UTC
svn commit: r201721 - in /ibatis/trunk/java/mapper/mapper2: doc/release.txt
src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java
src/com/ibatis/common/jdbc/logging/StatementLogProxy.java
Author: cbegin
Date: Fri Jun 24 21:46:28 2005
New Revision: 201721
URL: http://svn.apache.org/viewcvs?rev=201721&view=rev
Log:
IBATIS-152
IBATIS-149
IBATIS-116
Null result sets now handled properly by JDBC logging classes
Modified:
ibatis/trunk/java/mapper/mapper2/doc/release.txt
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java
Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=201721&r1=201720&r2=201721&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Fri Jun 24 21:46:28 2005
@@ -5,8 +5,9 @@
2.1.5 - June ??, 2004
------------------------------
- o Fixed IBATIS-136, groupBy not carried forward to extended result maps
- o Fixed IBATIS-139, discriminator being applied to too many result maps
+ o Fixed IBATIS-136 groupBy not carried forward to extended result maps
+ o Fixed IBATIS-139 discriminator being applied to too many result maps (thanks Sven)
+ o Fixed IBATIS-152, 149, 116 null result sets now handled properly by JDBC logging classes
------------------------------
2.1.0 - May 16, 2004
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java?rev=201721&r1=201720&r2=201721&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/PreparedStatementLogProxy.java Fri Jun 24 21:46:28 2005
@@ -52,7 +52,12 @@
clearColumnInfo();
if ("executeQuery".equals(method.getName())) {
ResultSet rs = (ResultSet) method.invoke(statement, params);
- return ResultSetLogProxy.newInstance(rs);
+ if ( rs != null ) {
+ return ResultSetLogProxy.newInstance(rs);
+ }
+ else {
+ return null;
+ }
} else {
return method.invoke(statement, params);
}
@@ -65,7 +70,12 @@
return method.invoke(statement, params);
} else if ("getResultSet".equals(method.getName())) {
ResultSet rs = (ResultSet) method.invoke(statement, params);
- return ResultSetLogProxy.newInstance(rs);
+ if ( rs != null ) {
+ return ResultSetLogProxy.newInstance(rs);
+ }
+ else {
+ return null;
+ }
} else {
return method.invoke(statement, params);
}
Modified: ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java
URL: http://svn.apache.org/viewcvs/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java?rev=201721&r1=201720&r2=201721&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java (original)
+++ ibatis/trunk/java/mapper/mapper2/src/com/ibatis/common/jdbc/logging/StatementLogProxy.java Fri Jun 24 21:46:28 2005
@@ -47,13 +47,23 @@
}
if ("executeQuery".equals(method.getName())) {
ResultSet rs = (ResultSet) method.invoke(statement, params);
- return ResultSetLogProxy.newInstance(rs);
+ if ( rs != null ) {
+ return ResultSetLogProxy.newInstance(rs);
+ }
+ else {
+ return null;
+ }
} else {
return method.invoke(statement, params);
}
} else if ("getResultSet".equals(method.getName())) {
ResultSet rs = (ResultSet) method.invoke(statement, params);
- return ResultSetLogProxy.newInstance(rs);
+ if ( rs != null ) {
+ return ResultSetLogProxy.newInstance(rs);
+ }
+ else {
+ return null;
+ }
} else {
return method.invoke(statement, params);
}