You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by jg...@apache.org on 2014/02/04 21:33:44 UTC
svn commit: r1564471 -
/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Author: jgrassel
Date: Tue Feb 4 20:33:44 2014
New Revision: 1564471
URL: http://svn.apache.org/r1564471
Log:
OPENJPA-2423: Added null-check to DB2Dictionary update
Modified:
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java?rev=1564471&r1=1564470&r2=1564471&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DB2Dictionary.java Tue Feb 4 20:33:44 2014
@@ -438,7 +438,7 @@ public class DB2Dictionary
}
} else {
if ( fetch != null && fetch.getIsolation() == Connection.TRANSACTION_READ_UNCOMMITTED
- && sel.getParent() == null) { // i.e. not a subquery
+ && sel != null && sel.getParent() == null) { // i.e. not a subquery
forUpdateString.append(" ").append(forReadOnlyClause)
.append(" ").append(withURClause);
}