svn commit: r1517839 - in /openjpa/branches/2.2.1.x: ./ openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

[hthomann]

Author: hthomann
Date: Tue Aug 27 14:57:21 2013
New Revision: 1517839

URL: http://svn.apache.org/r1517839
Log:
OPENJPA-2423: Isolation level is not working properly on DB2 for JPQL queries 
with nested sub-queries - committed to 2.2.1.x the patch/fix provided by Pinaki 
Poddar.

Modified:
    openjpa/branches/2.2.1.x/   (props changed)
    
openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java

Propchange: openjpa/branches/2.2.1.x/
------------------------------------------------------------------------------
  Merged /openjpa/branches/2.1.x:r1517838

Modified: 
openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=1517839&r1=1517838&r2=1517839&view=diff
==============================================================================
--- 
openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
 (original)
+++ 
openjpa/branches/2.2.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
 Tue Aug 27 14:57:21 2013
@@ -437,7 +437,8 @@ public class DB2Dictionary
                 break;
             }
         } else {
-               if ( fetch != null && fetch.getIsolation() == 
Connection.TRANSACTION_READ_UNCOMMITTED ) {
+               if ( fetch != null && fetch.getIsolation() == 
Connection.TRANSACTION_READ_UNCOMMITTED 
+                               && sel.getParent() == null) { // i.e. not a 
subquery
                    forUpdateString.append(" ").append(forReadOnlyClause)
                    .append(" ").append(withURClause);
                }