openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r439550 - /incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
Date Sat, 02 Sep 2006 06:36:19 GMT
Author: skim
Date: Fri Sep  1 23:36:19 2006
New Revision: 439550

URL: http://svn.apache.org/viewvc?rev=439550&view=rev
Log:
changed ordering to avoid super / subclass clashing

Modified:
    incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java

Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java?rev=439550&r1=439549&r2=439550&view=diff
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
(original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
Fri Sep  1 23:36:19 2006
@@ -1514,17 +1514,6 @@
             log.trace(_loc.get((embed) ? "resolve-embed-meta" : "resolve-meta",
                 this + "@" + System.identityHashCode(this)));
 
-        if (_type.isInterface()) {
-            if (!embed && _interface != Boolean.TRUE)
-                throw new MetaDataException(_loc.get("interface", _type));
-
-            if (runtime) {
-                _impl = _repos.getImplGenerator().createImpl(this);
-                if (!embed)
-                    _repos.setInterfaceImpl(this, _impl);
-            }
-        }
-
         if (runtime && !_type.isInterface() && 
             !PersistenceCapable.class.isAssignableFrom(_type))
             throw new MetaDataException(_loc.get("not-enhanced", _type));
@@ -1599,6 +1588,16 @@
         if (_fgMap != null)
             for (Iterator itr = _fgMap.values().iterator(); itr.hasNext();)
                 ((FetchGroup) itr.next()).resolve();
+
+        if (!embed && _type.isInterface()) {
+            if (_interface != Boolean.TRUE)
+                throw new MetaDataException(_loc.get("interface", _type));
+
+            if (runtime) {
+                _impl = _repos.getImplGenerator().createImpl(this);
+                _repos.setInterfaceImpl(this, _impl);
+            }
+        }
 
         // if this is runtime, create a pc instance and scan it for comparators
         if (runtime && !Modifier.isAbstract(_type.getModifiers())) {



Mime
View raw message