Author: mikedd
Date: Thu Apr 15 22:13:22 2010
New Revision: 934621
URL: http://svn.apache.org/viewvc?rev=934621&view=rev
Log:
OPENJPA-1001: less intrusive fix
Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
Modified:
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
URL:
http://svn.apache.org/viewvc/openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java?rev=934621&r1=934620&r2=934621&view=diff
==============================================================================
---
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
(original)
+++
openjpa/branches/1.3.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/SelectImpl.java
Thu Apr 15 22:13:22 2010
@@ -1414,8 +1414,10 @@ public class SelectImpl
val = pks[mapping.getField(join.getFieldIndex()).
getPrimaryKeyIndex()];
val = join.getJoinValue(val, toCols[i], store);
- if (parmList != null)
+ if (parmList != null && val != null) {
+ // if val is null we will have already appended an is NULL
clause.
parmList.add(val);
+ }
}
if (collectParmValueOnly)
