mirror of https://github.com/apache/openjpa.git
Fetch group fixes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@428577 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
d1df9344fe
commit
77e7d97379
|
@ -274,10 +274,12 @@ public class FetchGroup {
|
||||||
|
|
||||||
if (_meta != null) {
|
if (_meta != null) {
|
||||||
ClassMetaData sup = _meta.getPCSuperclassMetaData();
|
ClassMetaData sup = _meta.getPCSuperclassMetaData();
|
||||||
|
if (sup != null) {
|
||||||
FetchGroup supFG = sup.getFetchGroup(_name);
|
FetchGroup supFG = sup.getFetchGroup(_name);
|
||||||
if (supFG != null && supFG.isPostLoad())
|
if (supFG != null && supFG.isPostLoad())
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (_includes == null)
|
if (_includes == null)
|
||||||
return false;
|
return false;
|
||||||
|
|
|
@ -884,6 +884,7 @@ public class AnnotationPersistenceMetaDataParser
|
||||||
throw new MetaDataException(_loc.get("bad-fg-field", fg.getName(),
|
throw new MetaDataException(_loc.get("bad-fg-field", fg.getName(),
|
||||||
meta, attr.name()));
|
meta, attr.name()));
|
||||||
|
|
||||||
|
field.setInFetchGroup(fg.getName(), true);
|
||||||
if (attr.recursionDepth() != Integer.MIN_VALUE)
|
if (attr.recursionDepth() != Integer.MIN_VALUE)
|
||||||
fg.setRecursionDepth(field, attr.recursionDepth());
|
fg.setRecursionDepth(field, attr.recursionDepth());
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue