[416215] [DB] Enum default values are not correctly determined in

CoreTypeMappings.TMEnum 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=416215

1 files changed, 1 insertions, 14 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
index 24ddf4fb18..2d2decbd2d 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/CoreTypeMappings.java
@@ -31,10 +31,7 @@ import org.eclipse.net4j.db.DBType;
 import org.eclipse.net4j.util.HexUtil;
 import org.eclipse.net4j.util.factory.ProductCreationException;
 
-import org.eclipse.emf.common.util.Enumerator;
 import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EEnumLiteral;
 import org.eclipse.emf.ecore.EFactory;
 import org.eclipse.emf.ecore.EcorePackage;
 
@@ -78,17 +75,7 @@ public class CoreTypeMappings
     @Override
     protected Object getDefaultValue()
     {
-      EEnum eenum = (EEnum)getFeature().getEType();
-
-      String defaultValueLiteral = getFeature().getDefaultValueLiteral();
-      if (defaultValueLiteral != null)
-      {
-        EEnumLiteral literal = eenum.getEEnumLiteralByLiteral(defaultValueLiteral);
-        return literal.getValue();
-      }
-
-      Enumerator enumerator = (Enumerator)eenum.getDefaultValue();
-      return enumerator.getValue();
+      return getFeature().getDefaultValue();
     }
 
     /**