You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by aw...@apache.org on 2006/08/04 01:56:32 UTC
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
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());
}