[390474] Guard against recursive map entry type.

1 files changed, 8 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java
index 02e24dbc6..9ceb197bc 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/genmodel/impl/GenBaseImpl.java
@@ -1029,9 +1029,14 @@ public abstract class GenBaseImpl extends EObjectImpl implements GenBase
     String mapType = getEffectiveMapEntryType();  
     if (getEffectiveComplianceLevel().getValue() >= GenJDKLevel.JDK50)
     {
-      String keyType = genClass.getMapEntryKeyFeature().getType(context);
-      String valueType = genClass.getMapEntryValueFeature().getType(context);
-      mapType += "<" + keyType + ", " + valueType + ">";
+      GenFeature mapEntryKeyFeature = genClass.getMapEntryKeyFeature();
+      GenFeature mapEntryValueFeature = genClass.getMapEntryValueFeature();
+      if (mapEntryKeyFeature.getTypeGenClassifier() != genClass && mapEntryValueFeature.getTypeGenClassifier() != genClass)
+      {
+        String keyType = mapEntryKeyFeature.getType(context);
+        String valueType = mapEntryValueFeature.getType(context);
+        mapType += "<" + keyType + ", " + valueType + ">";
+      }
     }
     return mapType;
   }