Make sure we always shut down the executor

Previously, an ExecutionException from the task could cause the process
to hang, because the ExecutorService was never shut down

1 files changed, 14 insertions, 12 deletions

diff --git a/baksmali/src/main/java/org/jf/baksmali/baksmali.java b/baksmali/src/main/java/org/jf/baksmali/baksmali.java
index dc49640f..fcc89d7a 100644
--- a/baksmali/src/main/java/org/jf/baksmali/baksmali.java
+++ b/baksmali/src/main/java/org/jf/baksmali/baksmali.java
@@ -147,22 +147,24 @@ public class baksmali {
         }
 
         boolean errorOccurred = false;
-        for (Future<Boolean> task: tasks) {
-            while(true) {
-                try {
-                    if (!task.get()) {
-                        errorOccurred = true;
+        try {
+            for (Future<Boolean> task: tasks) {
+                while(true) {
+                    try {
+                        if (!task.get()) {
+                            errorOccurred = true;
+                        }
+                    } catch (InterruptedException ex) {
+                        continue;
+                    } catch (ExecutionException ex) {
+                        throw new RuntimeException(ex);
                     }
-                } catch (InterruptedException ex) {
-                    continue;
-                } catch (ExecutionException ex) {
-                    throw new RuntimeException(ex);
+                    break;
                 }
-                break;
             }
+        } finally {
+            executor.shutdown();
         }
-
-        executor.shutdown();
         return !errorOccurred;
     }