You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by an...@apache.org on 2009/04/15 20:57:22 UTC
svn commit: r765306 - in /db/jdo/trunk/api2/src/java/javax/jdo:
PersistenceManager.java PersistenceManagerFactory.java Query.java
Author: andyj
Date: Wed Apr 15 18:57:22 2009
New Revision: 765306
URL: http://svn.apache.org/viewvc?rev=765306&view=rev
Log:
JDO-623 Apply Michaels patch
Modified:
db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java
db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
db/jdo/trunk/api2/src/java/javax/jdo/Query.java
Modified: db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java?rev=765306&r1=765305&r2=765306&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManager.java Wed Apr 15 18:57:22 2009
@@ -953,6 +953,22 @@
*/
boolean getIgnoreCache();
+ /** Set the default query timeout setting for all <code>Query</code>
+ * instances obtained from this PersistenceManager.
+ *
+ * @param interval The default timeout setting (millisecs).
+ * @since 2.3
+ */
+ void setQueryTimeoutMillis(Integer interval);
+
+ /** Get the default query timeout setting for all
+ * <code>Query</code> instances obtained from this PersistenceManager.
+ *
+ * @return the default query timeout setting.
+ * @since 2.3
+ */
+ Integer getQueryTimeoutMillis();
+
/** Gets the detachAllOnCommit setting.
* @see #setDetachAllOnCommit(boolean)
* @since 2.0
Modified: db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java?rev=765306&r1=765305&r2=765306&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/PersistenceManagerFactory.java Wed Apr 15 18:57:22 2009
@@ -526,7 +526,7 @@
* @param interval The default timeout setting (millisecs).
* @since 2.3
*/
- void setQueryTimeoutMillis(int interval);
+ void setQueryTimeoutMillis(Integer interval);
/** Get the default query timeout setting for all
* <code>PersistenceManager</code> instances obtained from this factory.
@@ -534,7 +534,7 @@
* @return the default query timeout setting.
* @since 2.3
*/
- int getQueryTimeoutMillis();
+ Integer getQueryTimeoutMillis();
/** Return non-configurable properties of this
* <code>PersistenceManagerFactory</code>.
Modified: db/jdo/trunk/api2/src/java/javax/jdo/Query.java
URL: http://svn.apache.org/viewvc/db/jdo/trunk/api2/src/java/javax/jdo/Query.java?rev=765306&r1=765305&r2=765306&view=diff
==============================================================================
--- db/jdo/trunk/api2/src/java/javax/jdo/Query.java (original)
+++ db/jdo/trunk/api2/src/java/javax/jdo/Query.java Wed Apr 15 18:57:22 2009
@@ -704,7 +704,14 @@
* @since 2.3
* @param interval The timeout interval (millisecs)
*/
- void setTimeoutMillis(int interval);
+ void setTimeoutMillis(Integer interval);
+
+ /** Get the timeout setting for query executions.
+ *
+ * @return the query timeout setting.
+ * @since 2.3
+ */
+ Integer getQueryTimeoutMillis();
/**
* Method to cancel any executing queries.