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

OPENJPA-1608: port the fix to openjpa 2.0.x 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@930916 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Fay Wang 2010-04-05 17:46:02 +00:00
parent e9ee2f5887
commit 551a5d211c
1 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/InformixDictionary.java
View File

@ -27,7 +27,6 @@ import java.sql.Statement;
import java.sql.Types;
import java.util.Arrays;
import java.util.Collection;
import java.util.Set;
import org.apache.openjpa.jdbc.identifier.DBIdentifier;
import org.apache.openjpa.jdbc.identifier.DBIdentifier.DBIdentifierType;
@ -317,24 +316,15 @@ public class InformixDictionary
// if we haven't already done so, initialize the lock mode of the
// connection
if (lockModeEnabled && _seenConnections.add(conn)) {
String sql = "SET LOCK MODE TO WAIT";
if (lockWaitSeconds > 0)
sql = sql + " " + lockWaitSeconds;
Statement stmnt = null;
try {
stmnt = conn.createStatement();
stmnt.executeUpdate(sql);
} catch (SQLException se) {
throw SQLExceptions.getStore(se, this);
} finally {
if (stmnt != null)
try {
stmnt.close();
} catch (SQLException se) {
}
if (_seenConnections.add(conn)) {
if (lockModeEnabled) {
String sql = "SET LOCK MODE TO WAIT";
if (lockWaitSeconds > 0)
sql = sql + " " + lockWaitSeconds;
execute(sql, conn);
}
String sql = "SET ENVIRONMENT RETAINUPDATELOCKS 'ALL'";
execute(sql, conn);
}
// the datadirect driver requires that we issue a rollback before using
@ -346,6 +336,22 @@ public class InformixDictionary
}
return conn;
}
private void execute(String sql, Connection conn) {
Statement stmnt = null;
try {
stmnt = conn.createStatement();
stmnt.executeUpdate(sql);
} catch (SQLException se) {
throw SQLExceptions.getStore(se, this);
} finally {
if (stmnt != null)
try {
stmnt.close();
} catch (SQLException se) {
}
}
}
@Override
public void indexOf(SQLBuffer buf, FilterValue str, FilterValue find,