openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hthom...@apache.org
Subject svn commit: r1429159 - in /openjpa/branches/1.0.x: ./ openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
Date Fri, 04 Jan 2013 22:11:22 GMT
Author: hthomann
Date: Fri Jan  4 22:11:21 2013
New Revision: 1429159

URL: http://svn.apache.org/viewvc?rev=1429159&view=rev
Log:
OPENJPA-570: Misleading "Found duplicate query" warning message - back ported Albert's 1.2.x
changes to 1.0.x.

Modified:
    openjpa/branches/1.0.x/   (props changed)
    openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java

Propchange: openjpa/branches/1.0.x/
------------------------------------------------------------------------------
  Merged /openjpa/trunk:r648275

Modified: openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=1429159&r1=1429158&r2=1429159&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
(original)
+++ openjpa/branches/1.0.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
Fri Jan  4 22:11:21 2013
@@ -536,20 +536,20 @@ public class AnnotationPersistenceMetaDa
                         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:



Mime
View raw message