Description Martin Freidank 2016-01-18 03:09:29 EST

During processing of metadata there occurs a NullPointerException if you decide to use multitenancy with inherited entity structure.

You can easily reproduce this with the following entities:

@Entity
@Multitenant
@TenantDiscriminatorColumn(primaryKey = true)
public class Base
{
	@Id
	private Long id;
}


public class Derived extends Base
{
}


The fix is simple using the following patch. All Tests run successfully.


Index: InheritanceMetadata.java
===================================================================
--- InheritanceMetadata.java	(revision 0)
+++ InheritanceMetadata.java	(working copy)
@@ -235,7 +235,7 @@
             
             // If the root descriptor has an id class, we need to set the same 
             // id class on our descriptor.
-            if (rootDescriptor.hasCompositePrimaryKey()) {
+            if (rootDescriptor.hasPKClass()) {
                 descriptor.setPKClass(rootDescriptor.getPKClass());
             }
         } else {