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

OPENJPA-878 Committing code and test updates contributed by Donald Woods. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@755819 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jeremy Bauer 2009-03-19 02:54:39 +00:00
parent bb1bc8a39d
commit 05c5ad096b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionary.java
View File

@ -4190,7 +4190,7 @@ public class DBDictionary
*/ */
public void setTimeouts(PreparedStatement stmnt, public void setTimeouts(PreparedStatement stmnt,
JDBCFetchConfiguration fetch, boolean forUpdate) throws SQLException { JDBCFetchConfiguration fetch, boolean forUpdate) throws SQLException {
if (this.supportsQueryTimeout) { if (supportsQueryTimeout) {
int timeout = fetch.getQueryTimeout(); int timeout = fetch.getQueryTimeout();
if (forUpdate) { if (forUpdate) {
// if this is a locking select and the lock timeout is greater // if this is a locking select and the lock timeout is greater
@ -4216,7 +4216,7 @@ public class DBDictionary
*/ */
public void setTimeouts(PreparedStatement stmnt, JDBCConfiguration conf, public void setTimeouts(PreparedStatement stmnt, JDBCConfiguration conf,
boolean forUpdate) throws SQLException { boolean forUpdate) throws SQLException {
if (this.supportsQueryTimeout) { if (supportsQueryTimeout) {
int timeout = conf.getQueryTimeout(); int timeout = conf.getQueryTimeout();
if (forUpdate) { if (forUpdate) {
// if this is a locking select and the lock timeout is greater // if this is a locking select and the lock timeout is greater
@ -4234,7 +4234,7 @@ public class DBDictionary
*/ */
public void setQueryTimeout(PreparedStatement stmnt, int timeout) public void setQueryTimeout(PreparedStatement stmnt, int timeout)
throws SQLException { throws SQLException {
if (this.supportsQueryTimeout && timeout >= 0) { if (supportsQueryTimeout && timeout >= 0) {
if (timeout > 0 && timeout < 1000) { if (timeout > 0 && timeout < 1000) {
timeout = 1000; timeout = 1000;
Log log = conf.getLog(JDBCConfiguration.LOG_JDBC); Log log = conf.getLog(JDBCConfiguration.LOG_JDBC);