openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From allee8...@apache.org
Subject svn commit: r648359 - /openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
Date Tue, 15 Apr 2008 18:07:45 GMT
Author: allee8285
Date: Tue Apr 15 11:07:42 2008
New Revision: 648359

URL: http://svn.apache.org/viewvc?rev=648359&view=rev
Log:
OPENJPA-570 - Apply same change from trunk to 1.1.x branch.

Modified:
    openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java

Modified: openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java?rev=648359&r1=648358&r2=648359&view=diff
==============================================================================
--- openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
(original)
+++ openjpa/branches/1.1.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java
Tue Apr 15 11:07:42 2008
@@ -534,20 +534,20 @@
                         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