Author: jgrassel
Date: Thu Apr 9 18:08:11 2015
New Revision: 1672435
URL: http://svn.apache.org/r1672435
Log:
OPENJPA-2570: Allow an informix user the option to disable the
RETAINUPDATELOCKS sql
Modified:
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
Modified:
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java?rev=1672435&r1=1672434&r2=1672435&view=diff
==============================================================================
---
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
(original)
+++
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
Thu Apr 9 18:08:11 2015
@@ -324,19 +324,21 @@ public class InformixDictionary
// if we haven't already done so, initialize the lock mode of the
// connection
- if (_seenConnections.add(conn)) {
- if (lockModeEnabled) {
- String sql = "SET LOCK MODE TO WAIT";
- if (lockWaitSeconds > 0)
- sql = sql + " " + lockWaitSeconds;
- execute(sql, conn, true);
+ synchronized(_seenConnections) {
+ if (_seenConnections.add(conn)) {
+ if (lockModeEnabled) {
+ String sql = "SET LOCK MODE TO WAIT";
+ if (lockWaitSeconds > 0)
+ sql = sql + " " + lockWaitSeconds;
+ execute(sql, conn, true);
+ }
+
+ if (!disableRetainUpdateLocksSQL){
+ String sql = "SET ENVIRONMENT RETAINUPDATELOCKS 'ALL'";
+ execute(sql, conn, false);
+ }
}
-
- if (!disableRetainUpdateLocksSQL){
- String sql = "SET ENVIRONMENT RETAINUPDATELOCKS 'ALL'";
- execute(sql, conn, false);
- }
- }
+ }
// the datadirect driver requires that we issue a rollback before using
// each connection
