kill waiting thread only if its still alive

amitrathore · Oct 15, 2009 · f69d7d2 · f69d7d2
1 parent 2d8969b
commit f69d7d2
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/org/runa/swarmiji/client/client_core.clj b/src/org/runa/swarmiji/client/client_core.clj
@@ -43,13 +43,14 @@
   (let [chan (:channel sevak-proxy) queue (:queue sevak-proxy) thread (:thread sevak-proxy)]
     (try
      (with-swarmiji-bindings
-       (log-message "Force disconnecting!")
        (.queueDelete chan queue)
        (catch Exception e))
        ;no-op, this sevak-proxy should be aborted, thats it
-       (finally
-	(.interrupt thread)))))
-
+     (finally
+      (if (.isAlive thread)
+        (do
+          (log-message "Force interrupt!")          
+          (.interrupt thread)))))))
 
 (defn on-swarm [sevak-service & args]
   (log-message "On-swarm!")