1 files changed, 7 insertions, 2 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
index c1c3476c2c..3438d59b85 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java
@@ -52,7 +52,7 @@ public class GenericJavaTableGenerator
 	protected String specifiedPkColumnValue;
 	protected String defaultPkColumnValue;
 
-	protected final UniqueConstraintContainer uniqueConstraintContainer;
+	protected final ContextListContainer<JavaUniqueConstraint, UniqueConstraintAnnotation> uniqueConstraintContainer;
 
 
 	// ********** constructor **********
@@ -65,7 +65,7 @@ public class GenericJavaTableGenerator
 		this.specifiedPkColumnName = generatorAnnotation.getPkColumnName();
 		this.specifiedValueColumnName = generatorAnnotation.getValueColumnName();
 		this.specifiedPkColumnValue = generatorAnnotation.getPkColumnValue();
-		this.uniqueConstraintContainer = new UniqueConstraintContainer();
+		this.uniqueConstraintContainer = this.buildUniqueConstraintContainer();
 	}
 
 
@@ -379,6 +379,11 @@ public class GenericJavaTableGenerator
 		return this.getGeneratorAnnotation().getUniqueConstraints();
 	}
 
+	protected ContextListContainer<JavaUniqueConstraint, UniqueConstraintAnnotation> buildUniqueConstraintContainer() {
+		UniqueConstraintContainer container = new UniqueConstraintContainer();
+		container.initialize();
+		return container;
+	}
 
 	/**
 	 * unique constraint container