From e775808d4fb53ad4c89f33fdd6a0369d63c53e6b Mon Sep 17 00:00:00 2001
From: Erin Harris <eharris@ca.ibm.com>
Date: Wed, 29 Apr 2020 13:45:19 -0400
Subject: [PATCH] CW Issue #2790: Fix various issues with debug

---
 .../core/internal/CodewindEclipseApplication.java      | 10 ----------
 .../org/eclipse/codewind/core/internal/KubeUtil.java   |  5 -----
 .../core/internal/RemoteEclipseApplication.java        |  3 ++-
 .../internal/launch/CodewindLaunchConfigDelegate.java  |  4 +---
 4 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/CodewindEclipseApplication.java b/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/CodewindEclipseApplication.java
index caee8d39c..2746b8e2a 100644
--- a/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/CodewindEclipseApplication.java
+++ b/dev/org.eclipse.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
index 26f614575..7212d087e 100644
--- 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/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/RemoteEclipseApplication.java b/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/RemoteEclipseApplication.java
index a8edd6f7c..7be26f992 100644
--- a/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/RemoteEclipseApplication.java
+++ b/dev/org.eclipse.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/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/launch/CodewindLaunchConfigDelegate.java b/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/launch/CodewindLaunchConfigDelegate.java
index faf9cfd28..d600048eb 100644
--- a/dev/org.eclipse.codewind.core/src/org/eclipse/codewind/core/internal/launch/CodewindLaunchConfigDelegate.java
+++ b/dev/org.eclipse.codewind.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);