OPENJPA-570 - Apply same change from trunk to 1.1.x branch.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.1.x@648359 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Albert Lee 2008-04-15 18:07:42 +00:00
parent e5f31365e6
commit abbc41eec5

View File

@ -534,20 +534,20 @@ public class AnnotationPersistenceMetaDataParser
meta.setObjectIdType(((IdClass) anno).value(), true);
break;
case NATIVE_QUERIES:
if (isQueryMode())
if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY) == 0)
parseNamedNativeQueries(_cls,
((NamedNativeQueries) anno).value());
break;
case NATIVE_QUERY:
if (isQueryMode())
if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY) == 0)
parseNamedNativeQueries(_cls, (NamedNativeQuery) anno);
break;
case QUERIES:
if (isQueryMode())
if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY) == 0)
parseNamedQueries(_cls, ((NamedQueries) anno).value());
break;
case QUERY:
if (isQueryMode())
if (isQueryMode() && (meta.getSourceMode() & MODE_QUERY) == 0)
parseNamedQueries(_cls, (NamedQuery) anno);
break;
case SEQ_GENERATOR: