[400236] [Legacy] ClassCastException on CDOLegacyWrapper when native

reference legacy 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=400236

1 files changed, 12 insertions, 1 deletions

diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
index 4acf823001..a40952ea04 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/CDOStoreImpl.java
@@ -11,6 +11,7 @@
  *    Eike Stepper & Simon McDuff - bug 204890
  *    Simon McDuff - bug 246705
  *    Simon McDuff - bug 246622
+ *    Christian W. Damus (CEA) - bug 400236: get internal instance of objects in ID conversion
  */
 package org.eclipse.emf.internal.cdo.view;
 
@@ -693,7 +694,7 @@ public final class CDOStoreImpl implements CDOStore
       }
     }
 
-    return value;
+    return getInternalInstance(value);
   }
 
   private InternalCDOObject getCDOObject(Object object)
@@ -701,6 +702,16 @@ public final class CDOStoreImpl implements CDOStore
     return FSMUtil.adapt(object, view);
   }
 
+  private Object getInternalInstance(Object object)
+  {
+    if (object instanceof InternalCDOObject)
+    {
+      return ((InternalCDOObject)object).cdoInternalInstance();
+    }
+
+    return object;
+  }
+
   private static InternalCDORevision getRevisionForReading(InternalCDOObject cdoObject)
   {
     CDOStateMachine.INSTANCE.read(cdoObject);