From da40761ff6db73d5737f6fe80d047793f6593deb Mon Sep 17 00:00:00 2001
From: nhauge
Date: Fri, 18 May 2012 16:30:42 +0000
Subject: 379856 - Invalid validation error against attributes of dynamic type
 mappings.  Patch from Karen.

---
 .../jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java   | 6 +++---
 1 file 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;
 	}
 
 
-- 
cgit v1.2.3