From b84e5c63aaded9d15d38b43ea9fbfb09a976e12a Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <kris7topher@gmail.com>
Date: Wed, 12 Feb 2020 20:40:38 +0100
Subject: Fix concurrency bug in AlloyHandler

---
 .../inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend')

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend
index ed2ef6b7..451aad6e 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/src/hu/bme/mit/inf/dlsreasoner/alloy/reasoner/builder/AlloyHandler.xtend
@@ -101,15 +101,8 @@ class AlloyHandler {
 			try{
 				answers = future.get(configuration.runtimeLimit,TimeUnit.SECONDS)
 				finished = true
-			} catch (TimeoutException ex) {
-   				// handle the timeout
-			} catch (InterruptedException e) {
-				// handle the interrupts
-			} catch (ExecutionException e) {
-				// handle other exceptions
-			} finally {
-				future.cancel(true);
-				
+			} catch (TimeoutException | InterruptedException | ExecutionException e) {
+				future.cancel(true)
 				answers = callable.partialAnswers
 				finished = false
 			}
-- 
cgit v1.2.3-54-g00ecf