Author: cbegin
Date: Mon Jun 5 14:31:12 2006
New Revision: 411923
URL: http://svn.apache.org/viewvc?rev=411923&view=rev
Log:
Fixed iBATIS-286: Close session upon null user connection
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=411923&r1=411922&r2=411923&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Mon Jun 5
14:31:12 2006
@@ -1,5 +1,5 @@
#Build version info
-#Mon Jun 05 15:03:40 MDT 2006
+#Mon Jun 05 15:28:34 MDT 2006
version=2.1.7
-buildDate=2006/06/05 15\:03
-buildNum=612
+buildDate=2006/06/05 15\:28
+buildNum=613
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java?rev=411923&r1=411922&r2=411923&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
Mon Jun 5 14:31:12 2006
@@ -159,8 +159,14 @@
}
public void setUserConnection(Connection connection) throws SQLException {
+ try {
getLocalSqlMapSession().setUserConnection(connection);
+ } finally {
+ if (connection == null) {
+ getLocalSqlMapSession().close();
+ }
}
+}
/**
* TODO Deprecated
