svn commit: r1539086 - in /openjpa/branches/2.1.x: ./ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/ openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/ openjpa-persistence-jdbc/src/test/java/org/apache...

[hthomann]

Author: hthomann
Date: Tue Nov  5 18:00:57 2013
New Revision: 1539086

URL: http://svn.apache.org/r1539086
Log:
OPENJPA-2330: Stackoverflow due to endless recursive calls - back ported to 
2.1.x Rick Cutis's changes to trunk.

Added:
    
openjpa/branches/2.1.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.1.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.1.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.1.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.1.x/   (props changed)
    
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/
   (props changed)
    
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java

Propchange: openjpa/branches/2.1.x/
------------------------------------------------------------------------------
  Merged /openjpa/branches/2.2.1.x:r1531176
  Merged /openjpa/trunk:r1448662,1448796

Propchange: 
openjpa/branches/2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany/
------------------------------------------------------------------------------
  Merged 
/openjpa/branches/2.2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany:r1531176
  Merged 
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/inheritance/jointable/onetomany:r1448662,1448796

Modified: 
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
URL: 
http://svn.apache.org/viewvc/openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java?rev=1539086&r1=1539085&r2=1539086&view=diff
==============================================================================
--- 
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
 (original)
+++ 
openjpa/branches/2.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
 Tue Nov  5 18:00:57 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) {