Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Johnston2017-11-08 17:50:25 -0500
committerJeff Johnston2017-11-09 11:46:28 -0500
commit5f1962e0682d5fef8ff401c6638d0bb4c71b9a1e (patch)
tree591b2a5ba414e6cbee3f7a8b0696f163eb6a44ba
parentbacbb7b3c7b2c8213cd24c8027974cebf0d584a4 (diff)
downloadorg.eclipse.cdt-5f1962e0682d5fef8ff401c6638d0bb4c71b9a1e.tar.gz
org.eclipse.cdt-5f1962e0682d5fef8ff401c6638d0bb4c71b9a1e.tar.xz
org.eclipse.cdt-5f1962e0682d5fef8ff401c6638d0bb4c71b9a1e.zip
Bug 527019 - Build not running in Container for Managed Make project
- the CommandLauncherManager.CommandLauncherWrapper class is designed to figure out what launcher to use after being created and a project is set, but it is not built for reuse - change the CommandLauncherWrapper class to reset the launcher back to null when the project gets set so that any reuse will be sure to get the correct internal launcher after resetting the project Change-Id: I2c0758ca53f7164d4bbd4a6f738acd7c7c042370
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java13
1 files changed, 4 insertions, 9 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java
index 9cb0ef6ca0..a090891c4a 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/CommandLauncherManager.java
@@ -69,11 +69,8 @@ public class CommandLauncherManager {
@Override
public void setProject(IProject project) {
- if (launcher != null) {
- launcher.setProject(project);
- } else {
- fProject = project;
- }
+ fProject = project;
+ launcher = null;
}
@Override
@@ -88,9 +85,8 @@ public class CommandLauncherManager {
public void showCommand(boolean show) {
if (launcher != null) {
launcher.showCommand(show);
- } else {
- fShowCommand = show;
}
+ fShowCommand = show;
}
@Override
@@ -105,9 +101,8 @@ public class CommandLauncherManager {
public void setErrorMessage(String error) {
if (launcher != null) {
launcher.setErrorMessage(error);
- } else {
- fErrorMessage = error;
}
+ fErrorMessage = error;
}
@Override

Back to the top