openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From awh...@apache.org
Subject svn commit: r428577 - in /incubator/openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
Date Thu, 03 Aug 2006 23:56:32 GMT
Author: awhite
Date: Thu Aug  3 16:56:32 2006
New Revision: 428577

URL: http://svn.apache.org/viewvc?rev=428577&view=rev
Log:
Fetch group fixes.


Modified:
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java
    incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java?rev=428577&r1=428576&r2=428577&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java
(original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/FetchGroup.java
Thu Aug  3 16:56:32 2006
@@ -274,9 +274,11 @@
 
         if (_meta != null) {
             ClassMetaData sup = _meta.getPCSuperclassMetaData();
-            FetchGroup supFG = sup.getFetchGroup(_name);
-            if (supFG != null && supFG.isPostLoad())
-                return true;
+            if (sup != null) {
+                FetchGroup supFG = sup.getFetchGroup(_name);
+                if (supFG != null && supFG.isPostLoad())
+                    return true;
+            }
         }
 
         if (_includes == null)

Modified: incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=428577&r1=428576&r2=428577&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
(original)
+++ incubator/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
Thu Aug  3 16:56:32 2006
@@ -884,6 +884,7 @@
             throw new MetaDataException(_loc.get("bad-fg-field", fg.getName(),
                 meta, attr.name()));
 
+        field.setInFetchGroup(fg.getName(), true);
         if (attr.recursionDepth() != Integer.MIN_VALUE)
             fg.setRecursionDepth(field, attr.recursionDepth());
     }



Mime
View raw message