eol.engine: fix CachedResourceSet release if model fails to save (fixes #181)

Author: agarciadom

plugins/org.eclipse.epsilon.eol.engine/src/org/eclipse/epsilon/eol/models/CachedModel.java

@@ -307,9 +307,12 @@ public void load(StringProperties properties, IRelativePathResolver resolver) th
 
 	@Override
 	public void dispose() {
-		super.dispose();
-		clearCache();
-		disposeModel();
+		try {
+			super.dispose();
+		} finally {
+			clearCache();
+			disposeModel();
+		}
 	}
 
 	public void clearCache() {

tests/org.eclipse.epsilon.emc.emf.test/src/org/eclipse/epsilon/emc/emf/CachedResourceSetTests.java

@@ -18,6 +18,8 @@
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.impl.ResourceFactoryImpl;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -76,6 +78,30 @@ public void testDisposeBadModel() throws Exception {
 				0, CachedResourceSet.getCache().size());		
 	}
 
+	@SuppressWarnings("resource")
+	@Test
+	public void testDisposeFailedSave() throws Exception {
+		// Register a file extension whose saves will always fail
+		Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("brokensave", new ResourceFactoryImpl());
+		
+		EmfModel model = new EmfModel();
+		model.setModelFileUri(URI.createFileURI(new File("f.brokensave").getAbsolutePath()));
+		model.setMetamodelUri(EcorePackage.eNS_URI);
+		model.setReadOnLoad(false);
+		model.setStoredOnDisposal(true);
+		model.load();
+
+		try {
+			model.dispose();
+			fail("Saving the model should have failed");
+		} catch (Exception ex) {
+			// do nothing - this is expected
+		}
+
+		assertEquals("Disposing a model which failed to save should result in an empty cache",
+				0, CachedResourceSet.getCache().size());
+	}
+
 	@Test
 	public void testGc() throws Exception {
 		model1.load();