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 2008/08/05 16:06:06 UTC
svn commit: r682716 -
/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
Author: mikedd
Date: Tue Aug 5 07:06:05 2008
New Revision: 682716
URL: http://svn.apache.org/viewvc?rev=682716&view=rev
Log:
OPENJPA-485 merge change from revision 682570 to 1.2.x branch
Modified:
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java?rev=682716&r1=682715&r2=682716&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java Tue Aug 5 07:06:05 2008
@@ -489,8 +489,10 @@
for (; from != null && from != to;
from = from.getJoinablePCSuperclassMapping()) {
- pstate.field = from.getFieldMapping(pstate.field
- .getName());
+ FieldMapping cast = from.getFieldMapping(pstate.field
+ .getName());
+ if (cast != null)
+ pstate.field = cast;
pstate.joins = from.joinSuperclass(pstate.joins, false);
}
}