Merge pull request #230 from rubenporras/master

Fix ClassCastException when lazy loading node model from binary
dsldevkit · Apr 3, 2019 · 6f5fc07 · 6f5fc07
2 parents 8c6dd44 + 0eaabf7
commit 6f5fc07
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...ols.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java b/...ols.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/persistence/ProxyCompositeNode.java
@@ -132,7 +132,10 @@ private static ProxyCompositeNode uninstallProxyNode(final EObject eObject) {
     for (int i = 0; i < size; ++i) {
       Adapter adapter = adapters.get(i);
       if (adapter.isAdapterForType(ProxyCompositeNode.class)) {
-        return (ProxyCompositeNode) adapters.remove(i);
+        if (adapter instanceof ProxyCompositeNode) {
+          return (ProxyCompositeNode) adapters.remove(i);
+        }
+        break;
       }
     }
     return null;