You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jackrabbit.apache.org by cl...@apache.org on 2008/01/28 23:19:42 UTC

svn commit: r616083 - /jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java

Author: clombart
Date: Mon Jan 28 14:19:41 2008
New Revision: 616083

URL: http://svn.apache.org/viewvc?rev=616083&view=rev
Log:
Patch applied for JCR-1316

Modified:
    jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java

Modified: jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java?rev=616083&r1=616082&r2=616083&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java (original)
+++ jackrabbit/trunk/jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java Mon Jan 28 14:19:41 2008
@@ -242,7 +242,15 @@
      * @return the fieldDescriptor ID
      */
     public FieldDescriptor getIdFieldDescriptor() {
-        return idFieldDescriptor;
+        if (null != this.idFieldDescriptor) {
+           return this.idFieldDescriptor;
+       }
+
+       if (null != this.superClassDescriptor) {
+           return this.superClassDescriptor.getIdFieldDescriptor();
+       }
+
+       return null;
     }
 
     /**