From bdc9486813ababcd7351c6056614fa22e2284df7 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Wed, 18 Feb 2009 21:04:25 +0000
Subject: [262880]  [UI] Integrate with Common Navigator Framework
 https://bugs.eclipse.org/bugs/show_bug.cgi?id=262880

---
 .../src/org/eclipse/emf/internal/cdo/util/ModelUtil.java     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util')

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
index f8d12da1ae..5d0c9047bf 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/util/ModelUtil.java
@@ -276,7 +276,17 @@ public final class ModelUtil
     Object defaultValue = eFeature.getDefaultValue();
     if (type == CDOType.CUSTOM)
     {
-      defaultValue = EcoreUtil.convertToString((EDataType)eFeature.getEType(), defaultValue);
+      try
+      {
+        defaultValue = EcoreUtil.convertToString((EDataType)eFeature.getEType(), defaultValue);
+      }
+      catch (RuntimeException ex)
+      {
+        if (defaultValue != null)
+        {
+          throw ex;
+        }
+      }
     }
 
     return CDOModelUtil.createAttribute(containingClass, featureID, name, type, defaultValue, many);
-- 
cgit v1.2.3