mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-18 22:45:23 +02:00
Code Issues Wiki Activity

[274153] Applied Yu-Fen's patch.

Browse source
This commit is contained in:
Anna Dushistova 2011-05-11 21:20:33 +00:00
parent f85de17305
commit 2fe6818ed1
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/terminal/SshTerminalShell.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2008 Wind River Systems, Inc. and others. * Copyright (c) 2008, 2011 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -9,6 +9,7 @@
* Martin Oberhuber (Wind River) - initial API and implementation * Martin Oberhuber (Wind River) - initial API and implementation
* Anna Dushistova (MontaVista) - [170910] Integrate the TM Terminal View with RSE * Anna Dushistova (MontaVista) - [170910] Integrate the TM Terminal View with RSE
* Martin Oberhuber (Wind River) - [227320] Fix endless loop in SshTerminalShell * Martin Oberhuber (Wind River) - [227320] Fix endless loop in SshTerminalShell
* Yufen Kuo (MontaVista) - [274153] Fix pipe closed with RSE
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.services.ssh.terminal; package org.eclipse.rse.internal.services.ssh.terminal;
@ -208,7 +209,10 @@ public class SshTerminalShell extends AbstractTerminalShell {
fChannel.disconnect(); fChannel.disconnect();
} finally { } finally {
fChannel = null; fChannel = null;
isActive(); }
Session session = fSessionProvider.getSession();
if (session != null && !session.isConnected()) {
fSessionProvider.handleSessionLost();
} }
} }
} }
@ -217,12 +221,6 @@ public class SshTerminalShell extends AbstractTerminalShell {
if (fChannel != null && !fChannel.isEOF()) { if (fChannel != null && !fChannel.isEOF()) {
return true; return true;
} }
// shell is not active: check for session lost
exit();
Session session = fSessionProvider.getSession();
if (session != null && !session.isConnected()) {
fSessionProvider.handleSessionLost();
}
return false; return false;
} }

6
rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/HostShellProcessAdapter.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2006, 2008 PalmSource, Inc. and others. * Copyright (c) 2006, 2011, PalmSource, Inc. and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -12,6 +12,7 @@
* Martin Oberhuber (Wind River) - renamed from HostShellAdapter (bug 161777) * Martin Oberhuber (Wind River) - renamed from HostShellAdapter (bug 161777)
* Martin Oberhuber (Wind River) - improved Javadoc * Martin Oberhuber (Wind River) - improved Javadoc
* Greg Watson (IBM) - patch for bug #252060 * Greg Watson (IBM) - patch for bug #252060
* Yufen Kuo (MontaVista) - [274153] Fix pipe closed with RSE
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.services.shells; package org.eclipse.rse.services.shells;
@ -84,6 +85,7 @@ IHostShellOutputListener {
public synchronized int exitValue() { public synchronized int exitValue() {
if(hostShell.isActive()) if(hostShell.isActive())
throw new IllegalThreadStateException(); throw new IllegalThreadStateException();
hostShell.exit();
// No way to tell what the exit value was. // No way to tell what the exit value was.
// TODO it would be possible to get the exit value // TODO it would be possible to get the exit value
// when the remote process is started like this: // when the remote process is started like this:
@ -136,7 +138,7 @@ IHostShellOutputListener {
// Allow for the data from the stream to be read if it's available // Allow for the data from the stream to be read if it's available
if (inputStream.available() != 0 || errorStream.available() != 0) if (inputStream.available() != 0 || errorStream.available() != 0)
throw new InterruptedException(); throw new InterruptedException();
hostShell.exit();
hostShellInput.close(); hostShellInput.close();
hostShellError.close(); hostShellError.close();
inputStream.close(); inputStream.close();