openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awh...@apache.org
Subject svn commit: r713822 - /openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
Date Thu, 13 Nov 2008 21:02:33 GMT
Author: awhite
Date: Thu Nov 13 13:02:33 2008
New Revision: 713822

URL: http://svn.apache.org/viewvc?rev=713822&view=rev
Log:
Merge 690383 from 0.9.7 to 1.1.x.


Modified:
    openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java

Modified: openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java?rev=713822&r1=713821&r2=713822&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
(original)
+++ openjpa/branches/1.1.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/exps/PCPath.java
Thu Nov 13 13:02:33 2008
@@ -488,8 +488,11 @@
                     }
 
                     for (; from != null && from != to;
-                        from = from.getJoinablePCSuperclassMapping())
+                        from = from.getJoinablePCSuperclassMapping()) {
+                        pstate.field = from.getFieldMapping(pstate.field
+                            .getName());
                         pstate.joins = from.joinSuperclass(pstate.joins, false);
+                    }
                 }
                 // nothing more to do from here on as we encountered an xpath action
                 if (action.op == Action.GET_XPATH)



Mime
View raw message