| commit | 9dca1fb7a9b3e249dc9dd73aba12db50c00b6f7e | [log] [tgz] |
|---|---|---|
| author | kmoore <kmoore> | Thu Mar 12 17:21:04 2009 +0000 |
| committer | kmoore <kmoore> | Thu Mar 12 17:21:04 2009 +0000 |
| tree | 4c1dfc915a7553519d542995cd6f87f3f5451df9 | |
| parent | eddd6ef8c39e66266764d5602307427ca0e842c3 [diff] |
267260 - forgot an extra check in the validation, don't want to validate the discriminator column if it is undefined in the context
diff --git a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java index 44e3a25..f7783ec 100644 --- a/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.core/src/org/eclipse/jpt/core/internal/context/orm/AbstractOrmEntity.java
@@ -2233,7 +2233,7 @@ } protected void validateDiscriminatorColumn(List<IMessage> messages, IReporter reporter) { - if (specifiedDiscriminatorColumnIsAllowed()) { + if (specifiedDiscriminatorColumnIsAllowed() && !discriminatorColumnIsUndefined()) { getDiscriminatorColumn().validate(messages, reporter); } else if (getDiscriminatorColumn().isResourceSpecified()) {