Index: jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java
===================================================================
--- jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java	(revision 628407)
+++ jackrabbit-ocm/src/main/java/org/apache/jackrabbit/ocm/mapper/model/ClassDescriptor.java	(working copy)
@@ -288,7 +288,7 @@
      * @return true if the class has an ID
      */
     public boolean hasIdField() {
-        return (this.idFieldDescriptor != null && ! this.idFieldDescriptor.equals(""));
+        return (this.idFieldDescriptor != null && this.idFieldDescriptor.isId());
     }
 
     /**