Merge pull request #948 from virtualcell/947-fix-autocommit

autocommit now defaults to true for oracle driver, vcell needs false
virtualcell · Aug 20, 2023 · af8dab0 · af8dab0
2 parents f91ac77 + 9ef7015
commit af8dab0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/vcell-oracle/src/main/java/org/vcell/db/oracle/OraclePoolingConnectionFactory.java b/vcell-oracle/src/main/java/org/vcell/db/oracle/OraclePoolingConnectionFactory.java
@@ -100,6 +100,7 @@ public synchronized Connection getConnection(Object lock) throws SQLException {
 				"3. there is a problem with network.\n" +
 				"details: "+detailedErrorMsg, exception);
 	}
+	conn.setAutoCommit(false);
 	return conn;
 }
 

diff --git a/vcell-server/src/main/java/org/vcell/db/postgres/PostgresConnectionFactory.java b/vcell-server/src/main/java/org/vcell/db/postgres/PostgresConnectionFactory.java
@@ -58,7 +58,6 @@ public synchronized Connection getConnection(Object lock) throws SQLException {
 	Connection conn = null;
 	try {
 		conn = poolDataSource.getConnection();
-		conn.setAutoCommit(false);
 	} catch (SQLException ex) {
 		// might be invalid or stale connection
 		if (lg.isTraceEnabled()) lg.trace("first time #getConnection( ) fail " + ex.getMessage() + ", state " + ex.getSQLState() + ", attempting refresh");
@@ -76,6 +75,7 @@ public synchronized Connection getConnection(Object lock) throws SQLException {
 				"2. there is a problem with database server.\n" +
 				"3. there is a problem with network.\n");
 	}
+	conn.setAutoCommit(false);
 	return conn;
 }