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

Bug 485658 - NPE prevents displaying the actual error

Browse source 
Change-Id: I66ec6d071a6807e6f90835bdc09e9cc46e6808fe
Signed-off-by: Kaloyan Raev <kaloyan.r@zend.com>
This commit is contained in:
Kaloyan Raev 2016-01-12 16:18:46 +02:00
parent 222deaa4e4
commit 916992ab3d
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/org.eclipse.tm.terminal.connector.process/src/org/eclipse/tm/terminal/connector/process/ProcessConnector.java
View file

@ -1,11 +1,12 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2011, 2015 Wind River Systems, Inc. and others. All rights reserved. * Copyright (c) 2011, 2016 Wind River Systems, Inc. and others. All rights reserved.
* This program and the accompanying materials are made available under the terms * This program and the accompanying materials are made available under the terms
* of the Eclipse Public License v1.0 which accompanies this distribution, and is * of the Eclipse Public License v1.0 which accompanies this distribution, and is
* available at http://www.eclipse.org/legal/epl-v10.html * available at http://www.eclipse.org/legal/epl-v10.html
* *
* Contributors: * Contributors:
* Wind River Systems - initial API and implementation * Wind River Systems - initial API and implementation
* Kaloyan Raev - Bug 485658 - NPE prevents displaying the actual error
*******************************************************************************/ *******************************************************************************/
package org.eclipse.tm.terminal.connector.process; package org.eclipse.tm.terminal.connector.process;
@ -241,7 +242,9 @@ public class ProcessConnector extends AbstractStreamsConnector {
@Override @Override
public void doDisconnect() { public void doDisconnect() {
// Stop monitoring the process // Stop monitoring the process
monitor.dispose(); if (monitor != null) {
monitor.dispose();
}
boolean isWindows = Platform.OS_WIN32.equals(Platform.getOS()); boolean isWindows = Platform.OS_WIN32.equals(Platform.getOS());