You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by ht...@apache.org on 2013/10/11 04:49:34 UTC
svn commit: r1531177 - in /openjpa/branches/2.2.x: ./
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/
openjpa-persistence/src/main/java/org/apache/open...
Author: hthomann
Date: Fri Oct 11 02:49:34 2013
New Revision: 1531177
URL: http://svn.apache.org/r1531177
Log:
OPENJPA-2330: Stackoverflow due to endless recursive calls - back ported to 2.2.x Rick Cutis's changes to trunk.
Added:
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java
- copied unchanged from r1531176, openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestOpenJPA2330.java
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java
- copied unchanged from r1531176, openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityA.java
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java
- copied unchanged from r1531176, openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityB.java
openjpa/branches/2.2.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityC.java
- copied unchanged from r1531176, openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/EntityC.java
Modified:
openjpa/branches/2.2.x/ (props changed)
openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
Propchange: openjpa/branches/2.2.x/
------------------------------------------------------------------------------
Merged /openjpa/branches/2.2.1.x:r1531176
Merged /openjpa/trunk:r1448662,1448796
Modified: openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java?rev=1531177&r1=1531176&r2=1531177&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java (original)
+++ openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java Fri Oct 11 02:49:34 2013
@@ -152,6 +152,9 @@ public class OpenJPAPersistenceUtil {
return LoadState.NOT_LOADED;
}
}
+ if (pcs != null && pcs.contains(sm)) {
+ return LoadState.LOADED;
+ }
FieldMetaData[] fmds = sm.getMetaData().getFields();
// Check load state of all persistent eager fetch attributes
if (fmds != null && fmds.length > 0) {