svn commit: r442269 - in /incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa: meta/ClassMetaData.java util/ImplHelper.java

[awhite]

Author: awhite
Date: Mon Sep 11 10:28:44 2006
New Revision: 442269

URL: http://svn.apache.org/viewvc?view=rev&rev=442269
Log:
Change to allow fields to use per-class sequences.


Modified:
    
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/meta/ClassMetaData.java
    
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.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?view=diff&rev=442269&r1=442268&r2=442269
==============================================================================
--- 
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
 Mon Sep 11 10:28:44 2006
@@ -812,7 +812,6 @@
     protected FieldMetaData getSuperclassField(FieldMetaData supField) {
         ClassMetaData sm = getPCSuperclassMetaData();
         FieldMetaData fmd = sm == null ? null : 
sm.getField(supField.getName());
-
         if (fmd == null || fmd.getManagement() != fmd.MANAGE_PERSISTENT)
             throw new MetaDataException(_loc.get("unmanaged-sup-field",
                 supField, this));

Modified: 
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java
URL: 
http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java?view=diff&rev=442269&r1=442268&r2=442269
==============================================================================
--- 
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java
 (original)
+++ 
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/util/ImplHelper.java
 Mon Sep 11 10:28:44 2006
@@ -139,7 +139,8 @@
      */
     public static Object generateFieldValue(StoreContext ctx,
         FieldMetaData fmd) {
-        return generateValue(ctx, null, fmd, fmd.getDeclaredTypeCode());
+        return generateValue(ctx, fmd.getDefiningMetaData(), fmd, 
+            fmd.getDeclaredTypeCode());
     }
 
     /**