changed CollectionContainer to have the client call initialize, virtuals should not to be initialized. this was causing an NPE related to entityMappings tenantDiscriminatorColumns

1 files changed, 8 insertions, 2 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java
index a5b3997bbd..3f764f759b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java
@@ -59,7 +59,7 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable>
 	protected String specifiedCatalog;
 	protected String defaultCatalog;
 
-	protected final UniqueConstraintContainer uniqueConstraintContainer;
+	protected final ContextListContainer<OrmUniqueConstraint, XmlUniqueConstraint> uniqueConstraintContainer;
 
 
 	// ********** constructor/initialization **********
@@ -75,7 +75,7 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable>
 		this.specifiedName = this.buildSpecifiedName();
 		this.specifiedSchema = this.buildSpecifiedSchema();
 		this.specifiedCatalog = this.buildSpecifiedCatalog();
-		this.uniqueConstraintContainer = new UniqueConstraintContainer();
+		this.uniqueConstraintContainer = this.buildUniqueConstraintContainer();
 	}
 
 
@@ -328,6 +328,12 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable>
 				new LiveCloneListIterable<XmlUniqueConstraint>(xmlTable.getUniqueConstraints());
 	}
 
+	protected ContextListContainer<OrmUniqueConstraint, XmlUniqueConstraint> buildUniqueConstraintContainer() {
+		UniqueConstraintContainer container = new UniqueConstraintContainer();
+		container.initialize();
+		return container;
+	}
+
 	/**
 	 * unique constraint container
 	 */