From b4248d587629200cbde2cc48964d28c053411d15 Mon Sep 17 00:00:00 2001
From: Ben Fry <fry@processing.org>
Date: Sat, 27 Apr 2013 15:38:17 -0400
Subject: [PATCH] switch to socket attach connector, fix error msg for bitness
 of libs, fighting with Eclipse JDI

---
 .../mode/experimental/DebugRunner.java        | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pdex/src/processing/mode/experimental/DebugRunner.java b/pdex/src/processing/mode/experimental/DebugRunner.java
index f438a7023..1f810d964 100755
--- a/pdex/src/processing/mode/experimental/DebugRunner.java
+++ b/pdex/src/processing/mode/experimental/DebugRunner.java
@@ -44,18 +44,18 @@ public class DebugRunner extends processing.mode.java.runner.Runner {
      * @return debuggee VM or null on failure
      */
     public VirtualMachine launch() {
-        String[] machineParamList = getMachineParams();
-        String[] sketchParamList = getSketchParams();
-        /*
-         * System.out.println("vm launch sketch params:"); for (int i=0;
-         * i<sketchParamList.length; i++) {
-         * System.out.println(sketchParamList[i]); } System.out.println("vm
-         * launch machine params:"); for (int i=0; i<machineParamList.length;
-         * i++) { System.out.println(machineParamList[i]); }
-         *
-         */
-        vm = launchVirtualMachine(machineParamList, sketchParamList); // will return null on failure
-        if (vm != null) {
+//        String[] machineParamList = getMachineParams();
+//        String[] sketchParamList = getSketchParams(false);
+//        /*
+//         * System.out.println("vm launch sketch params:"); for (int i=0;
+//         * i<sketchParamList.length; i++) {
+//         * System.out.println(sketchParamList[i]); } System.out.println("vm
+//         * launch machine params:"); for (int i=0; i<machineParamList.length;
+//         * i++) { System.out.println(machineParamList[i]); }
+//         *
+//         */
+//        vm = launchVirtualMachine(machineParamList, sketchParamList); // will return null on failure
+        if (launchVirtualMachine(false)) {  // will return null on failure
             redirectStreams(vm);
         }
         return vm;
@@ -67,9 +67,9 @@ public class DebugRunner extends processing.mode.java.runner.Runner {
      * @param vm the VM
      */
     protected void redirectStreams(VirtualMachine vm) {
-        MessageSiphon ms = new MessageSiphon(vm.process().getErrorStream(), this);
+        MessageSiphon ms = new MessageSiphon(process.getErrorStream(), this);
         errThread = ms.getThread();
-        outThread = new StreamRedirectThread("VM output reader", vm.process().getInputStream(), System.out);
+        outThread = new StreamRedirectThread("VM output reader", process.getInputStream(), System.out);
         errThread.start();
         outThread.start();
     }