svn merge -c 13655 bleeding_edge trunk

dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/configs/DartServerLaunchConfigurationDelegate.java

Index: dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/configs/DartServerLaunchConfigurationDelegate.java
===================================================================
--- dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/configs/DartServerLaunchConfigurationDelegate.java	(revision 13655)
+++ dart/editor/tools/plugins/com.google.dart.tools.debug.core/src/com/google/dart/tools/debug/core/configs/DartServerLaunchConfigurationDelegate.java	(working copy)
@@ -17,7 +17,6 @@
 import com.google.dart.tools.core.model.DartSdkManager;
 import com.google.dart.tools.debug.core.DartDebugCorePlugin;
 import com.google.dart.tools.debug.core.DartLaunchConfigWrapper;
-import com.google.dart.tools.debug.core.server.ServerDebugTarget;
 import com.google.dart.tools.debug.core.util.NetUtils;
 
 import org.eclipse.core.resources.IResource;
@@ -115,9 +114,11 @@
     commandsList.add(vmExecPath);
     commandsList.addAll(Arrays.asList(launchConfig.getVmArgumentsAsArray()));
 
-    if (enableDebugging && !DartCore.isWindows()) {
-      commandsList.add("--debug:" + connectionPort);
-    }
+    // BUG(5883) Debugging of standalone programs is disabled
+    // because it sometimes leads to program crashes.
+//    if (enableDebugging && !DartCore.isWindows()) {
+//      commandsList.add("--debug:" + connectionPort);
+//    }
 
     String packageRoot = DartCore.getPlugin().getPackageRootPref();
     if (packageRoot != null) {
@@ -176,21 +177,23 @@
 
     eclipseProcess.setAttribute(IProcess.ATTR_CMDLINE, generateCommandLine(commands));
 
-    if (enableDebugging && !DartCore.isWindows()) {
-      ServerDebugTarget debugTarget = new ServerDebugTarget(launch, eclipseProcess, connectionPort);
+    // BUG(5883) Debugging of standalone programs is disabled
+    // because it sometimes leads to program crashes.
+//    if (enableDebugging && !DartCore.isWindows()) {
+//      ServerDebugTarget debugTarget = new ServerDebugTarget(launch, eclipseProcess, connectionPort);
+//
+//      try {
+//        debugTarget.connect();
+//
+//        launch.addDebugTarget(debugTarget);
+//      } catch (DebugException ex) {
+//        // We don't throw an exception if the process died before we could connect.
+//        if (!isProcessDead(runtimeProcess)) {
+//          throw ex;
+//        }
+//      }
+//    }
 
-      try {
-        debugTarget.connect();
-
-        launch.addDebugTarget(debugTarget);
-      } catch (DebugException ex) {
-        // We don't throw an exception if the process died before we could connect.
-        if (!isProcessDead(runtimeProcess)) {
-          throw ex;
-        }
-      }
-    }
-
     monitor.done();
   }