From 35d12956f2b70deb51a50bafdfef4f72498a8d06 Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Fri, 11 May 2007 22:08:30 +0000
Subject: [PATCH] Protect ssh against trivial NPE on shell exit

---
 .../rse/internal/services/ssh/shell/SshHostShell.java     | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java
index b4f50a8951b..5daa1c68551 100644
--- a/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java
+++ b/rse/plugins/org.eclipse.rse.services.ssh/src/org/eclipse/rse/internal/services/ssh/shell/SshHostShell.java
@@ -168,8 +168,12 @@ public class SshHostShell extends AbstractHostShell implements IHostShell {
 	}
 
 	public void exit() {
-		fShellWriter.stopThread();
-		fChannel.disconnect();
+		if (fShellWriter!=null) {
+			fShellWriter.stopThread();
+		}
+		if (fChannel!=null) {
+			fChannel.disconnect();
+		}
 	}
 
 }