Author: cbegin
Date: Sun Aug 13 23:10:08 2006
New Revision: 431298
URL: http://svn.apache.org/viewvc?rev=431298&view=rev
Log:
Fixed IBATIS-320 When every method call openSession() return same object .
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapClientImpl.java
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.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=431298&r1=431297&r2=431298&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Sun Aug 13
23:10:08 2006
@@ -1,5 +1,5 @@
#Build version info
-#Sun Aug 13 23:45:30 MDT 2006
+#Mon Aug 14 00:07:17 MDT 2006
version=2.1.7
-buildDate=2006/08/13 23\:45
-buildNum=626
+buildDate=2006/08/14 00\:07
+buildNum=627
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=431298&r1=431297&r2=431298&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
Sun Aug 13 23:10:08 2006
@@ -214,14 +214,14 @@
}
public SqlMapSession openSession() {
- SqlMapSessionImpl sqlMapSession = getLocalSqlMapSession();
+ SqlMapSessionImpl sqlMapSession = new SqlMapSessionImpl(this);
sqlMapSession.open();
return sqlMapSession;
}
public SqlMapSession openSession(Connection conn) {
try {
- SqlMapSessionImpl sqlMapSession = getLocalSqlMapSession();
+ SqlMapSessionImpl sqlMapSession = new SqlMapSessionImpl(this);
sqlMapSession.open();
sqlMapSession.setUserConnection(conn);
return sqlMapSession;
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java?rev=431298&r1=431297&r2=431298&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/impl/SqlMapExecutorDelegate.java
Sun Aug 13 23:10:08 2006
@@ -838,7 +838,7 @@
session.setTransactionState(TransactionState.STATE_USER_PROVIDED);
} else {
session.setTransaction(null);
- pushSession(session);
+ session.reset(); // used to be pushSession, which is probably incorrect.
}
}
/**
