diff options
2 files changed, 4 insertions, 4 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java index a556674c0a..d5e99192ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java @@ -170,6 +170,8 @@ public abstract class AbstractJavaEntity this.specifiedName = this.mappingAnnotation.getName(); this.idClassReference = this.buildIdClassReference(); this.table = this.buildTable(); + // start with the entity as the root - it will be recalculated in update() + this.rootEntity = this; this.specifiedSecondaryTableOwner = this.buildSpecifiedSecondaryTableOwner(); this.specifiedSecondaryTableContainer = this.buildSpecifiedSecondaryTableContainer(); this.primaryKeyJoinColumnOwner = this.buildPrimaryKeyJoinColumnOwner(); @@ -177,8 +179,6 @@ public abstract class AbstractJavaEntity this.specifiedInheritanceStrategy = this.buildSpecifiedInheritanceStrategy(); this.specifiedDiscriminatorValue = this.getDiscriminatorValueAnnotation().getValue(); this.discriminatorColumn = this.buildDiscriminatorColumn(); - // start with the entity as the root - it will be recalculated in update() - this.rootEntity = this; this.attributeOverrideContainer = this.buildAttributeOverrideContainer(); this.associationOverrideContainer = this.buildAssociationOverrideContainer(); this.generatorContainer = this.buildGeneratorContainer(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java index 78ae7e70c7..fc0e6767ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java @@ -195,6 +195,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> this.specifiedName = xmlEntity.getName(); this.idClassReference = this.buildIdClassReference(); this.table = this.buildTable(); + // start with the entity as the root - it will be recalculated in update() + this.rootEntity = this; this.secondaryTableOwner = this.buildSecondaryTableOwner(); this.specifiedSecondaryTableContainer = this.buildSpecifiedSecondaryTableContainer(); this.virtualSecondaryTableContainer = this.buildVirtualSecondaryTableContainer(); @@ -203,8 +205,6 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> this.specifiedInheritanceStrategy = this.buildSpecifiedInheritanceStrategy(); this.specifiedDiscriminatorValue = xmlEntity.getDiscriminatorValue(); this.discriminatorColumn = this.buildDiscriminatorColumn(); - // start with the entity as the root - it will be recalculated in update() - this.rootEntity = this; this.attributeOverrideContainer = this.buildAttributeOverrideContainer(); this.associationOverrideContainer = this.buildAssociationOverrideContainer(); this.generatorContainer = this.buildGeneratorContainer(); |