[284818]TENEO1_0_4

1 files changed, 5 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EcoreAccess.java b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EcoreAccess.java
index 410f4e800..5705b69e6 100644
--- a/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EcoreAccess.java
+++ b/plugins/org.eclipse.emf.teneo.hibernate/src/org/eclipse/emf/teneo/hibernate/mapping/property/EcoreAccess.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: EcoreAccess.java,v 1.7 2008/04/20 10:31:56 mtaal Exp $
+ * $Id: EcoreAccess.java,v 1.7.2.1 2009/07/28 03:11:14 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.hibernate.mapping.property;
@@ -20,18 +20,20 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.EStructuralFeature.Internal.DynamicValueHolder;
 import org.eclipse.emf.ecore.impl.BasicEObjectImpl;
+import org.eclipse.emf.ecore.impl.DynamicEObjectImpl;
 import org.eclipse.emf.teneo.util.FieldUtil;
 
 /**
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.7.2.1 $
  */
 public class EcoreAccess {
 
 	/** Return the DynamicValueHolder */
 	public static DynamicValueHolder getValueHolder(BasicEObjectImpl deo) {
-		if (deo instanceof DynamicValueHolder) {
+		// if (deo instanceof DynamicValueHolder) {
+		if (deo instanceof DynamicValueHolder && !(deo instanceof DynamicEObjectImpl)) {
 			return (DynamicValueHolder) deo;
 		}
 		return (DynamicValueHolder) FieldUtil.callMethod(deo, "eSettings", null);