| commit | 211d1f16e5e54693e28d8d717292feb7dc4801ec | [log] [tgz] |
|---|---|---|
| author | Dimitris Kolovos <dkolovos@cs.york.ac.uk> | Thu Jan 10 20:43:44 2019 +0000 |
| committer | Dimitris Kolovos <dkolovos@cs.york.ac.uk> | Thu Jan 10 20:43:44 2019 +0000 |
| tree | 7ea7e0a631064ee1430e379f654438b8d3d64680 | |
| parent | f549236877a044acb05bceb33f78f1d77ec9ecc7 [diff] |
Fixed NPE in AbstractEmfModel
diff --git a/plugins/org.eclipse.epsilon.emc.emf/src/org/eclipse/epsilon/emc/emf/AbstractEmfModel.java b/plugins/org.eclipse.epsilon.emc.emf/src/org/eclipse/epsilon/emc/emf/AbstractEmfModel.java index 2fce44d..86668ec 100644 --- a/plugins/org.eclipse.epsilon.emc.emf/src/org/eclipse/epsilon/emc/emf/AbstractEmfModel.java +++ b/plugins/org.eclipse.epsilon.emc.emf/src/org/eclipse/epsilon/emc/emf/AbstractEmfModel.java
@@ -377,8 +377,13 @@ registry = null; if (modelImpl != null) { Cache cache = CachedResourceSet.getCache(); - for (Resource r : modelImpl.getResourceSet().getResources()) { - cache.returnResource(r); + if (modelImpl.getResourceSet() != null) { + for (Resource r : modelImpl.getResourceSet().getResources()) { + cache.returnResource(r); + } + } + else { + cache.returnResource(modelImpl); } modelImpl = null; }