Author: dwoods
Date: Tue Oct 12 19:23:12 2010
New Revision: 1021891
URL: http://svn.apache.org/viewvc?rev=1021891&view=rev
Log:
OPENJPA-1831 DataSourceFactory manipulates queryTimeout which is already in
milliseconds
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
Modified:
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java?rev=1021891&r1=1021890&r2=1021891&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
(original)
+++
openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/DataSourceFactory.java
Tue Oct 12 19:23:12 2010
@@ -213,7 +213,7 @@ public class DataSourceFactory {
new ConfiguringConnectionDecorator();
ccd.setTransactionIsolation(conf.getTransactionIsolationConstant());
ccd.setQueryTimeout(conf.getQueryTimeout() == -1
- ? -1 : conf.getQueryTimeout() * 1000);
+ ? -1 : conf.getQueryTimeout());
Log log = conf.getLog(JDBCConfiguration.LOG_JDBC);
if (factory2 || !conf.isConnectionFactoryModeManaged()) {
if (!dict.supportsMultipleNontransactionalResultSets)
