diff options
author | nhauge | 2012-05-18 16:30:42 +0000 |
---|---|---|
committer | nhauge | 2012-05-18 16:30:42 +0000 |
commit | da40761ff6db73d5737f6fe80d047793f6593deb (patch) | |
tree | 72a43d18967f67f5e6a782dfd356bd7100b5bbec | |
parent | d67d4675af20cafda9d77174d618ed5bd85c45e3 (diff) | |
download | webtools.dali-da40761ff6db73d5737f6fe80d047793f6593deb.tar.gz webtools.dali-da40761ff6db73d5737f6fe80d047793f6593deb.tar.xz webtools.dali-da40761ff6db73d5737f6fe80d047793f6593deb.zip |
379856 - Invalid validation error against attributes of dynamic type mappings. Patch from Karen.
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java index 35bde89e52..59a438d18f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java @@ -249,14 +249,14 @@ public abstract class SpecifiedOrmPersistentType * @see #syncJavaPersistentType() */ protected void updateJavaPersistentType() { - JavaResourceType resourceType = this.resolveJavaResourceType(); - if (resourceType == null) { + if (this.getName() == null) { if (this.javaPersistentType != null) { this.javaPersistentType.dispose(); this.setJavaPersistentType(null); } } else { + JavaResourceType resourceType = this.resolveJavaResourceType(); if (this.javaPersistentType == null) { this.setJavaPersistentType(this.buildJavaPersistentType(resourceType)); } @@ -286,7 +286,7 @@ public abstract class SpecifiedOrmPersistentType } protected JavaPersistentType buildJavaPersistentType(JavaResourceType jrt) { - return this.getJpaFactory().buildJavaPersistentType(this, jrt); + return jrt != null ? this.getJpaFactory().buildJavaPersistentType(this, jrt) : null; } |