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

[161838] local shell reports isActive() wrong

Browse source
This commit is contained in:
Martin Oberhuber 2007-08-03 14:40:40 +00:00
parent f1764e6689
commit 9792926712
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalHostShell.java
View file

@ -12,7 +12,7 @@
* Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley. * Emily Bruner, Mazen Faraj, Adrian Storisteanu, Li Ding, and Kent Hawley.
* *
* Contributors: * Contributors:
* {Name} (company) - description of contribution. * Martin Oberhuber (Wind River) - [161838] local shell reports isActive() wrong
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.services.local.shells; package org.eclipse.rse.internal.services.local.shells;
@ -52,7 +52,13 @@ public class LocalHostShell extends AbstractHostShell implements IHostShell
*/ */
public boolean isActive() public boolean isActive()
{ {
return _shellThread.isAlive(); if (_stdoutHandler.isFinished()) {
if (_shellThread.isAlive()) {
_shellThread.stopThread();
}
return false;
}
return true;
} }
/* (non-Javadoc) /* (non-Javadoc)

8
rse/plugins/org.eclipse.rse.services.local/src/org/eclipse/rse/internal/services/local/shells/LocalShellThread.java
View file

@ -15,6 +15,7 @@
* Javier Montalvo Orús (Symbian) - 138619: Fix codepage on Win2K * Javier Montalvo Orús (Symbian) - 138619: Fix codepage on Win2K
* Lothar Werzinger (Tradescape) - 161838: Support terminating local shells * Lothar Werzinger (Tradescape) - 161838: Support terminating local shells
* David McKnight (IBM) - [189387] Use specified encoding for shell output * David McKnight (IBM) - [189387] Use specified encoding for shell output
* Martin Oberhuber (Wind River) - [161838] local shell reports isActive() wrong
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.services.local.shells; package org.eclipse.rse.internal.services.local.shells;
@ -359,7 +360,9 @@ public class LocalShellThread extends Thread
} }
catch (IOException e) catch (IOException e)
{ {
System.out.println(e); //MOB: Exception is expected when the process is already dead
//System.out.println(e);
// make the thread exit; // make the thread exit;
_isShell = false; _isShell = false;
} }
@ -381,7 +384,8 @@ public class LocalShellThread extends Thread
} }
catch (InterruptedException e) catch (InterruptedException e)
{ {
System.out.println(e); //System.out.println(e);
_isCancelled = true;
} }
//This function is where the Threads do real work, and return false when finished //This function is where the Threads do real work, and return false when finished