added force-continue

src/swank/core.clj

@@ -386,6 +386,7 @@ values."
 
          (= action :emacs-interrupt)
          (let [[thread & args] args]
+           (force-continue)
            (dosync
             (cond
              (and (true? thread) (seq @active-threads))

src/swank/core/cdt_backends.clj

@@ -7,15 +7,29 @@
   (:use swank.core.debugger-backends
         [swank.commands :only [defslimefn]]))
 
+(defmethod force-continue :cdt []
+           (.deleteEventRequests
+            (.eventRequestManager (cdt/vm))
+            (.exceptionRequests (.eventRequestManager (cdt/vm))))
+           (cdt/continue-vm))
+
 (defn backend-init []
+  (reset! dispatch-val :cdt)
   (cdt/cdt-attach-pid)
   (cdt/set-handler cdt/exception-handler cutils/default-handler)
   (cdt/set-handler cdt/breakpoint-handler cutils/default-handler)
   (cdt/set-handler cdt/step-handler cutils/default-handler)
   (cdt/create-thread-start-request)
   (reset! cdt/CDT-DISPLAY-MSG cutils/display-background-msg)
   (cutils/set-control-thread)
-  (cutils/set-system-thread-groups))
+  (cutils/set-system-thread-groups)
+
+  ;; this invocation of force-continue is only needed to force the loading
+  ;;  of the classes required by force-continue because inadvertently
+  ;;  catching an exception which happens to be in the classloader can cause a
+  ;;  deadlock
+
+  (force-continue))
 
 (defmethod swank-eval :cdt [form]
            (cdt/safe-reval (:thread *debugger-env*)

src/swank/core/cdt_utils.clj

@@ -79,7 +79,7 @@
 (defn default-handler [e]
   (when-not @control-thread
     (set-control-thread))
-  (if-not (exception-event? e)
+  (if-not (cdt/exception-event? e)
     (send-to-control-thread e)
     (if (@exception-events (.exception e))
       (cdt/continue-thread (cdt/get-thread e))

src/swank/core/debugger_backends.clj

@@ -6,6 +6,11 @@
 (defn get-debugger-backend [& args]
   (when *debugger-env* :cdt))
 
+(def dispatch-val (atom :default))
+
+(defn dbe-dispatch [& args]
+  @dispatch-val)
+
 (defmacro def-backend-multimethods [methods]
   `(do
      ~@(for [m methods]
@@ -16,6 +21,6 @@
    build-backtrace eval-string-in-frame step get-stack-trace
    next finish continue swank-eval handled-exception? debugger-exception?])
 
-(defmulti line-bp (constantly :cdt))
-
+(defmulti line-bp dbe-dispatch)
+(defmulti force-continue dbe-dispatch)