CW Issue #2790: Fix various issues with debug

eclipse-archived · Apr 29, 2020 · e775808 · e775808
1 parent a12671f
commit e775808
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 19 deletions.
diff --git a/...ipse.codewind.core/src/org/eclipse/codewind/core/internal/CodewindEclipseApplication.java b/...ipse.codewind.core/src/org/eclipse/codewind/core/internal/CodewindEclipseApplication.java
@@ -121,16 +121,6 @@ public void clearDebugger() {
 					Logger.logError("An error occurred while disconnecting the debugger for project: " + name, e); //$NON-NLS-1$
 				}
 			}
-			ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-			launchManager.removeLaunch(launch);
-			ILaunchConfiguration launchConfig = launch.getLaunchConfiguration();
-			if (launchConfig != null) {
-				try {
-					launchConfig.delete();
-				} catch (CoreException e) {
-					Logger.logError("An error occurred while deleting the launch configuration for project: " + name, e); //$NON-NLS-1$
-				}
-			}
 		}
 		setLaunch(null);
 	}

diff --git a/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/KubeUtil.java b/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/KubeUtil.java
@@ -101,11 +101,6 @@ public static void endPortForward(CodewindApplication app, PortForwardInfo pfInf
 			if (!pfInfo.launch.isTerminated()) {
 				pfInfo.launch.terminate();
 			}
-			DebugPlugin.getDefault().getLaunchManager().removeLaunch(pfInfo.launch);
-			ILaunchConfiguration launchConfig = pfInfo.launch.getLaunchConfiguration();
-			if (launchConfig != null) {
-				launchConfig.delete();
-			}
 		}
 	}
 

diff --git a/...clipse.codewind.core/src/org/eclipse/codewind/core/internal/RemoteEclipseApplication.java b/...clipse.codewind.core/src/org/eclipse/codewind/core/internal/RemoteEclipseApplication.java
@@ -73,11 +73,12 @@ public void clearDebugger() {
 
 	private void cleanupPortForwarding() {
 		if (debugPFInfo != null) {
+			Logger.log("Ending port forwarding for the " + name + " application: " + debugPFInfo.localPort + ":" + debugPFInfo.remotePort); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+
 			// Clear out the port forwarding info to indicate that it was ended internally
 			PortForwardInfo info = debugPFInfo;
 			debugPFInfo = null;
 			try {
-				Logger.log("Ending port forwarding for the " + name + " application: " + debugPFInfo.localPort + ":" + debugPFInfo.remotePort); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
 				KubeUtil.endPortForward(this, info);
 			} catch (Exception e) {
 				Logger.logError("An error occurred trying to terminate the debug port forward for: " + name, e); //$NON-NLS-1$

diff --git a/...wind.core/src/org/eclipse/codewind/core/internal/launch/CodewindLaunchConfigDelegate.java b/...wind.core/src/org/eclipse/codewind/core/internal/launch/CodewindLaunchConfigDelegate.java
@@ -73,10 +73,8 @@ private void launchInner(ILaunchConfiguration config, String launchMode, ILaunch
 			if (debugTarget != null) {
 				Logger.log("Debugger connect success. Application should go into Debugging state soon."); //$NON-NLS-1$
 				launch.addDebugTarget(debugTarget);
-			}
-			else {
+			} else if (!monitor.isCanceled()) {
 				Logger.logError("Debugger connect failure"); //$NON-NLS-1$
-
 				CoreUtil.openDialog(true,
 						Messages.DebuggerConnectFailureDialogTitle,
 						Messages.DebuggerConnectFailureDialogMsg);