228032 - Remove entity from cache list and the corresponding properties are not remove

1 files changed, 8 insertions, 0 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/customization/EclipseLinkCustomization.java b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/customization/EclipseLinkCustomization.java
index a677831c83..6b362bb63d 100644
--- a/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/customization/EclipseLinkCustomization.java
+++ b/jpa/plugins/org.eclipse.jpt.eclipselink.core/src/org/eclipse/jpt/eclipselink/core/internal/context/customization/EclipseLinkCustomization.java
@@ -380,6 +380,13 @@ public class EclipseLinkCustomization extends EclipseLinkPersistenceUnitProperti
 		return properties;
 	}
 
+	/**
+	 * Set all CustomizerProperties to default.
+	 */
+	private void clearCustomizerProperties(String entityName) {
+		this.setDescriptorCustomizer(null, entityName);
+	}
+
 	// ****** convenience methods *******
 	
 	private void putEntityCustomizerProperties(String entityName, CustomizerProperties properties) {
@@ -422,6 +429,7 @@ public class EclipseLinkCustomization extends EclipseLinkPersistenceUnitProperti
 		if (!this.entitiesCustomizerProperties.containsKey(entity)) {
 			return;
 		}
+		this.clearCustomizerProperties(entity);
 		this.entitiesCustomizerProperties.remove(entity);
 		this.fireListChanged(ENTITIES_LIST_PROPERTY);
 	}