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

[395465] [dstore][shells] customer hit an NPE on shell cleanup

Browse source
This commit is contained in:
David McKnight 2012-12-18 10:29:35 -05:00
parent 65dbcf2537
commit 32215e5569
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
rse/plugins/org.eclipse.rse.services.dstore/miners/org/eclipse/rse/internal/dstore/universal/miners/command/CommandMinerThread.java
View file

@ -37,6 +37,7 @@
* Noriaki Takatsu (IBM) [369767] [multithread][dstore] Invalid Default directory in shell Launch * Noriaki Takatsu (IBM) [369767] [multithread][dstore] Invalid Default directory in shell Launch
* David McKnight (IBM) [372968] [dstore][shell] provide support for csh and tcsh shells * David McKnight (IBM) [372968] [dstore][shell] provide support for csh and tcsh shells
* David McKnight (IBM) [395306] [dstore] Regression for CommandMinerThread authority * David McKnight (IBM) [395306] [dstore] Regression for CommandMinerThread authority
* David McKnight (IBM) [395465] [dstore][shells] customer hit an NPE on shell cleanup
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.dstore.universal.miners.command; package org.eclipse.rse.internal.dstore.universal.miners.command;
@ -1073,7 +1074,7 @@ public class CommandMinerThread extends MinerThread
{ {
} }
if (_stdOutputHandler.isAlive() && _theProcess != null) if (_stdOutputHandler != null && _stdOutputHandler.isAlive() && _theProcess != null)
{ {
_theProcess.destroy(); _theProcess.destroy();
} }
@ -1120,11 +1121,17 @@ public class CommandMinerThread extends MinerThread
_theProcess = null; _theProcess = null;
} }
if (_stdOutputHandler != null)
_stdOutputHandler.finish(); _stdOutputHandler.finish();
_stdErrorHandler.finish();
_stdInput.close(); if (_stdErrorHandler != null)
_stdError.close(); _stdErrorHandler.finish();
if (_stdInput != null)
_stdInput.close();
if (_stdError != null)
_stdError.close();
_status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$ _status.setAttribute(DE.A_NAME, "done"); //$NON-NLS-1$
_dataStore.refresh(_status); _dataStore.refresh(_status);