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

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 9cb0ef6ca0b..a090891c4aa 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