mirror of https://github.com/apache/openjpa.git
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:
parent
bb1bc8a39d
commit
05c5ad096b
|
@ -4190,7 +4190,7 @@ public class DBDictionary
|
|||
*/
|
||||
public void setTimeouts(PreparedStatement stmnt,
|
||||
JDBCFetchConfiguration fetch, boolean forUpdate) throws SQLException {
|
||||
if (this.supportsQueryTimeout) {
|
||||
if (supportsQueryTimeout) {
|
||||
int timeout = fetch.getQueryTimeout();
|
||||
if (forUpdate) {
|
||||
// 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,
|
||||
boolean forUpdate) throws SQLException {
|
||||
if (this.supportsQueryTimeout) {
|
||||
if (supportsQueryTimeout) {
|
||||
int timeout = conf.getQueryTimeout();
|
||||
if (forUpdate) {
|
||||
// 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)
|
||||
throws SQLException {
|
||||
if (this.supportsQueryTimeout && timeout >= 0) {
|
||||
if (supportsQueryTimeout && timeout >= 0) {
|
||||
if (timeout > 0 && timeout < 1000) {
|
||||
timeout = 1000;
|
||||
Log log = conf.getLog(JDBCConfiguration.LOG_JDBC);
|
||||
|
|
Loading…
Reference in New Issue