shell output notification issues

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/internal/services/dstore/shell/DStoreShellOutputReader.java

@@ -74,10 +74,17 @@ public class DStoreShellOutputReader extends AbstractHostShellOutputReader imple
 			
 		
 			try
+			{
+				if (_hostShell.isActive())
 				{
 					waitForResponse();	
 					return internalReadLine();
 				}
+				else
+				{
+					return null;
+				}
+			}
 			catch (Exception e)
 			{					
 				e.printStackTrace();
@@ -122,8 +129,7 @@ public class DStoreShellOutputReader extends AbstractHostShellOutputReader imple
 	}
 
 	/**
-	 * Causes the current thread to wait until this class request has been
+	 * Causes the current thread to wait until notified
-	 * fulfilled.
 	 */
 	public synchronized void waitForResponse()
 	{
@@ -138,7 +144,7 @@ public class DStoreShellOutputReader extends AbstractHostShellOutputReader imple
 	}
 	
 	/**
-	 * Causes all threads waiting for this class request to be filled
+	 * Causes all threads waiting for this 
 	 * to wake up.
 	 */
 	public synchronized void notifyResponse()

rse/plugins/org.eclipse.rse.services.dstore/src/org/eclipse/rse/services/dstore/shells/DStoreHostShell.java

@@ -63,6 +63,13 @@ public class DStoreHostShell extends AbstractHostShell implements IHostShell
 		return _stderrHandler;
 	}
 	
+	public DataElement getStatus()
+	{
+		return _status;
+	}
+
+	
+
 	public void exit()
 	{
 		writeToShell("exit"); //$NON-NLS-1$

rse/plugins/org.eclipse.rse.services/src/org/eclipse/rse/services/shells/AbstractHostShellOutputReader.java

@@ -77,6 +77,7 @@ public abstract class AbstractHostShellOutputReader  extends Thread implements I
 		else
 		{
 			finish();
+			_keepRunning = false;
 		}
 	
 	}
@@ -158,7 +159,6 @@ public abstract class AbstractHostShellOutputReader  extends Thread implements I
 		{
 
 			_waitIncrement = 0;
-			_keepRunning = false;
 			//dispose();
 		}
 	}

rse/plugins/org.eclipse.rse.subsystems.shells.dstore/src/org/eclipse/rse/subsystems/shells/dstore/model/DStoreServiceCommandShell.java

@@ -131,4 +131,18 @@ public class DStoreServiceCommandShell extends ServiceCommandShell
 		*/
 	}
 
+	public boolean isActive() 
+	{
+		boolean activeShell = _hostShell.isActive();
+		if (!activeShell)
+		{
+			DataElement status = ((DStoreHostShell)_hostShell).getStatus();
+			if (_output.size() < status.getNestedSize())
+			{
+				return true;
+			}				
+		}
+		return activeShell;
+	}
+	
 }

rse/plugins/org.eclipse.rse.ui/subsystems/org/eclipse/rse/core/subsystems/AbstractConnectorService.java

@@ -526,16 +526,30 @@ public abstract class AbstractConnectorService extends RSEModelObject implements
        		dialog.open();
 		}
 		if (shell == null)
+		{
+			try
 			{
 				shell = SystemBasePlugin.getActiveWorkbenchShell();
 			}
+			catch (Exception e)
+			{
+				shell = new Shell();
+			}
+		}
     		
 		if (supportsPassword() || supportsUserId()) 
 		{
 			if (shell == null)
+			{
+				try
 				{
 					shell = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell();
 				}
+				catch (Exception e)
+				{
+					shell = new Shell();
+				}
+			}
 			if (shell != null) {
 				boolean passwordNeeded = supportsPassword() && _passwordInfo.getPassword() == null;
 				boolean userIdNeeded = supportsUserId() && _passwordInfo.getUserid() == null;