Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-676 close connection used for CONTIGUOUS or TRANSACTIONAL sequences 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@683296 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Dick 2008-08-06 15:31:01 +00:00
parent e97d6d1598
commit ce3f368ab0
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/AbstractJDBCSeq.java
View File

@ -25,6 +25,7 @@ import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
import org.apache.openjpa.jdbc.kernel.JDBCStoreManager.RefCountConnection;
import org.apache.openjpa.jdbc.meta.ClassMapping;
import org.apache.openjpa.jdbc.schema.SchemaGroup;
import org.apache.openjpa.jdbc.sql.SQLExceptions;
@ -156,8 +157,10 @@ public abstract class AbstractJDBCSeq
*/
protected Connection getConnection(JDBCStore store)
throws SQLException {
if (type == TYPE_TRANSACTIONAL || type == TYPE_CONTIGUOUS)
if (type == TYPE_TRANSACTIONAL || type == TYPE_CONTIGUOUS) {
// Also increments ref count.
return store.getConnection();
}
else {
JDBCConfiguration conf = store.getConfiguration();
DataSource ds = conf.getDataSource2(store.getContext());
@ -171,13 +174,24 @@ public abstract class AbstractJDBCSeq
/**
* Close the current connection. If the sequence is
* <code>TYPE_TRANSACTIONAL</code> or <code>TYPE_CONTIGUOUS</code>
* nothing will be done. Otherwise the connection will be closed.
* we will decrement the ref count. Otherwise the connection will be
* committed and then closed.
*/
protected void closeConnection(Connection conn) {
if (conn == null)
return;
if (type == TYPE_TRANSACTIONAL || type == TYPE_CONTIGUOUS) {
// do nothing; this seq is part of the business transaction
// The seq is part of the business transaction however we need
// to decrement the ref count so that the connection may be
// closed appropriately.
if(conn instanceof RefCountConnection) {
try {
((RefCountConnection)conn).close();
}
catch(SQLException se) {
throw SQLExceptions.getStore(se);
}
}
return;
}
else {