Index: api2/src/java/javax/jdo/Query.java
===================================================================
--- api2/src/java/javax/jdo/Query.java	(Revision 757034)
+++ api2/src/java/javax/jdo/Query.java	(Arbeitskopie)
@@ -704,8 +704,15 @@
      * @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.
      * If the underlying datastore doesn't support cancellation of queries this will
Index: api2/src/java/javax/jdo/PersistenceManagerFactory.java
===================================================================
--- api2/src/java/javax/jdo/PersistenceManagerFactory.java	(Revision 757034)
+++ api2/src/java/javax/jdo/PersistenceManagerFactory.java	(Arbeitskopie)
@@ -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>.
Index: api2/src/java/javax/jdo/PersistenceManager.java
===================================================================
--- api2/src/java/javax/jdo/PersistenceManager.java	(Revision 757034)
+++ api2/src/java/javax/jdo/PersistenceManager.java	(Arbeitskopie)
@@ -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