OPENJPA-570: Misleading "Found duplicate query" warning message - back ported Albert's 1.2.x changes to 1.0.x.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.0.x@1429159 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Heath Thomann 2013-01-04 22:11:21 +00:00
parent 5e9d1d1cc4
commit aa3bf7eaab
1 changed files with 4 additions and 4 deletions

View File

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