Skip to content

Avoid hanging on Linux when launch xpm #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonahgraham wants to merge 1 commit into
base: develop
Choose a base branch
from
+5 −5
Open

Avoid hanging on Linux when launch xpm #649

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...dcdt.ui/src/org/eclipse/embedcdt/ui/templates/core/processes/ConditionalRunCommandUi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
import java.io.InputStreamReader;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

import org.eclipse.cdt.core.templateengine.TemplateCore;
import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
import org.eclipse.cdt.core.templateengine.process.ProcessFailureException;
import org.eclipse.cdt.core.templateengine.process.ProcessRunner;
import org.eclipse.cdt.utils.spawner.ProcessFactory;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
Expand Down Expand Up @@ -117,9 +117,6 @@ public void process(TemplateCore template, ProcessArgument[] args, String proces
}
}

// Inherit from parent process.
String envp[] = null;

String substitutedCwd = EclipseUtils.performStringSubstitution(cwd);
if (substitutedCwd == null) {
// If substitution fails, revert to the original string, to alert
Expand Down Expand Up @@ -150,7 +147,10 @@ public void run(IProgressMonitor pm) throws InterruptedException {
try {
BufferedReader reader = null;
pm.worked(1);
Process process = ProcessFactory.getFactory().exec(cmdArray, envp, dir);
ProcessBuilder processBuilder = new ProcessBuilder(Arrays.asList(cmdArray));
processBuilder.directory(dir);

Process process = processBuilder.start();
pm.worked(1);
reader = new BufferedReader(new InputStreamReader(process.getInputStream()));

Expand Down