eol.dap.test: dispose of module in finally block instead of @after

epsilonlabs · Aug 28, 2024 · e92c919 · e92c919
1 parent 1e21cea
commit e92c919
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/...on.eol.dap.test/src/org/eclipse/epsilon/eol/dap/test/AbstractEpsilonDebugAdapterTest.java b/...on.eol.dap.test/src/org/eclipse/epsilon/eol/dap/test/AbstractEpsilonDebugAdapterTest.java
@@ -146,11 +146,6 @@ public void setup() throws Exception {
 	@After
 	public void teardown() {
 		adapter.disconnect(new DisconnectArguments());
-		if (module != null) {
-			module.getContext().getModelRepository().dispose();
-			module.getContext().dispose();
-			module = null;
-		}
 	}
 
 	protected void assertStoppedBecauseOf(final String reason) throws InterruptedException {
@@ -237,6 +232,10 @@ protected void runModule() {
 			module.execute();
 		} catch (Throwable e) {
 			e.printStackTrace();
+		} finally {
+			module.getContext().getModelRepository().dispose();
+			module.getContext().dispose();
+			module = null;
 		}
 	}