Skip to content

Commit 0553211

Browse files
committed
Issue #204: Disconnect the debugger before removing the launch.
1 parent 625f30f commit 0553211

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

dev/com.ibm.microclimate.core/src/com/ibm/microclimate/core/internal/MCEclipseApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ public synchronized ILaunch getLaunch() {
111111
@Override
112112
public void clearDebugger() {
113113
if (launch != null) {
114-
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
115-
launchManager.removeLaunch(launch);
116114
IDebugTarget debugTarget = launch.getDebugTarget();
117115
if (debugTarget != null && !debugTarget.isDisconnected()) {
118116
try {
@@ -121,6 +119,8 @@ public void clearDebugger() {
121119
MCLogger.logError("An error occurred while disconnecting the debugger for project: " + name, e); //$NON-NLS-1$
122120
}
123121
}
122+
ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
123+
launchManager.removeLaunch(launch);
124124
}
125125
setLaunch(null);
126126
}

dev/com.ibm.microclimate.ui/plugin.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,14 @@ ACTION_OPEN_APP=&Open Application
1919
ACTION_CONTAINER_SHELL=Open &Container Shell
2020
ACTION_START_BUILD=&Build
2121
ACTION_IMPORT_PROJECT=&Import Project
22-
ACTION_SHOW_APP_CONSOLE=&Show App Log
22+
ACTION_SHOW_APP_CONSOLE=&Show Application Log
2323
ACTION_SHOW_BUILD_CONSOLE=S&how Build Log
2424
ACTION_REFRESH=Re&fresh
2525
ACTION_RESTART_RUN_MODE=Restart in &Run Mode
2626
ACTION_RESTART_DEBUG_MODE=Restart in &Debug Mode
2727
ACTION_ENABLE_DISABLE_AUTO_BUILD=Disable &Auto Build
2828
ACTION_OPEN_MICROCLIMATE_UI=Open Microclimate &UI
29-
ACTION_OPEN_APP_MONITOR=Open App &Monitor
29+
ACTION_OPEN_APP_MONITOR=Open Application &Monitor
3030

3131
PREFS_PARENT_PAGE_NAME=Microclimate
3232
PREFS_CONNECTION_PAGE_NAME=Microclimate Connections

0 commit comments

Comments
 (0)