You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/05/07 00:40:50 UTC

svn commit: r772459 - /openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

Author: mikedd
Date: Wed May  6 22:40:50 2009
New Revision: 772459

URL: http://svn.apache.org/viewvc?rev=772459&view=rev
Log:
OPENJPA-1067. Do not call setQueryTimeout for DB2 on Z/OS

Modified:
    openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=772459&r1=772458&r2=772459&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
+++ openjpa/branches/1.0.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Wed May  6 22:40:50 2009
@@ -265,6 +265,7 @@
         switch (db2ServerType) {
         case  db2ZOSV8xOrLater:
             // DB2 Z/OS 
+            supportsQueryTimeout = false;  // can only be set to 0 on z/OS
             characterColumnSize = 255;
             lastGeneratedKeyQuery = "SELECT IDENTITY_VAL_LOCAL() FROM "
                 + "SYSIBM.SYSDUMMY1";
@@ -367,7 +368,6 @@
        return (databaseProductVersion.indexOf("DSN") != -1
             || databaseProductName.indexOf("DB2/") == -1)
             && maj >= 8;
-           
     }
 
     public boolean isDB2ISeriesV5R3OrEarlier() {