mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-19 14:15:50 +02:00
Code Issues Wiki Activity

Apply patch for bug 158786 - remote shell doesnt close after launch

Browse source
This commit is contained in:
Martin Oberhuber 2006-10-20 20:08:32 +00:00
parent 218d051764
commit 47bc4d7548
2 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/HostShellAdapter.java
View file

@ -48,6 +48,8 @@ IHostShellOutputListener {
hostShell.exit(); hostShell.exit();
notifyAll(); notifyAll();
try { try {
hostShellInput.close();
hostShellError.close();
inputStream.close(); inputStream.close();
errorStream.close(); errorStream.close();
outputStream.close(); outputStream.close();
@ -56,7 +58,7 @@ IHostShellOutputListener {
} }
} }
public int exitValue() { public synchronized int exitValue() {
if(hostShell.isActive()) if(hostShell.isActive())
throw new IllegalThreadStateException(); throw new IllegalThreadStateException();
// No way to tell what the exit value was. // No way to tell what the exit value was.
@ -76,8 +78,30 @@ IHostShellOutputListener {
} }
public synchronized int waitFor() throws InterruptedException { public synchronized int waitFor() throws InterruptedException {
while(hostShell.isActive())
wait(); while(hostShell.isActive()) {
try {
wait(1000);
} catch (InterruptedException e) {
// ignore because we're polling to see if shell is still active.
}
}
try {
// Wait a second to try to get some more output from the target shell before closing.
wait(1000);
// Allow for the data from the stream to be read if it's available
if (inputStream.available() != 0 || errorStream.available() != 0)
throw new InterruptedException();
hostShellInput.close();
hostShellError.close();
inputStream.close();
errorStream.close();
outputStream.close();
} catch (IOException e) {
// Ignore
}
return 0; return 0;
} }

9
rse/examples/org.eclipse.rse.remotecdt/src/org/eclipse/rse/remotecdt/RemoteRunLaunchDelegate.java
View file

@ -55,6 +55,8 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate {
private final static String SHELL_SERVICE = "shell.service"; //$NON-NLS-1$ private final static String SHELL_SERVICE = "shell.service"; //$NON-NLS-1$
private final static String FILE_SERVICE = "file.service"; //$NON-NLS-1$ private final static String FILE_SERVICE = "file.service"; //$NON-NLS-1$
private final static String EXIT_CMD = "exit"; //$NON-NLS-1$
private final static String CMD_DELIMITER = ";"; //$NON-NLS-1$
/* /*
* (non-Javadoc) * (non-Javadoc)
@ -259,8 +261,13 @@ public class RemoteRunLaunchDelegate extends AbstractCLaunchDelegate {
protected Process remoteShellExec(ILaunchConfiguration config, String remoteCommandPath, protected Process remoteShellExec(ILaunchConfiguration config, String remoteCommandPath,
String arguments) throws CoreException { String arguments) throws CoreException {
String remote_command = arguments == null ? spaceEscapify(remoteCommandPath) : // The exit command is called to force the remote shell to close after our command
// is executed. This is to prevent a running process at the end of the debug session.
// See Bug 158786.
String real_remote_command = arguments == null ? spaceEscapify(remoteCommandPath) :
spaceEscapify(remoteCommandPath) + " " + arguments; //$NON-NLS-1$ spaceEscapify(remoteCommandPath) + " " + arguments; //$NON-NLS-1$
String remote_command = real_remote_command + CMD_DELIMITER + EXIT_CMD;
IShellService shellService = (IShellService) getConnectedRemoteService(config, SHELL_SERVICE); IShellService shellService = (IShellService) getConnectedRemoteService(config, SHELL_SERVICE);
// This is necessary because runCommand does not actually run the command right now. // This is necessary because runCommand does not actually run the command right now.