diff --git a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java index 3dbb5e92875..2b6d84ebdf0 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java +++ b/rse/plugins/org.eclipse.rse.subsystems.files.core/src/org/eclipse/rse/subsystems/files/core/subsystems/RemoteFileSubSystem.java @@ -392,6 +392,11 @@ public abstract class RemoteFileSubSystem extends SubSystem implements IRemoteFi throws java.lang.reflect.InvocationTargetException, java.lang.InterruptedException { + + if (!isConnected()) { + return null; + } + Object[] children = null; Vector vChildren = new Vector(); Vector vMessages = new Vector(); diff --git a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java index 0e82956bd4c..8ab65c7c3bd 100644 --- a/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java +++ b/rse/plugins/org.eclipse.rse.subsystems.processes.core/src/org/eclipse/rse/subsystems/processes/core/subsystem/impl/RemoteProcessSubSystemImpl.java @@ -123,6 +123,10 @@ public abstract class RemoteProcessSubSystemImpl extends SubSystem implements throws InvocationTargetException, InterruptedException { + if (!isConnected()) { + return null; + } + HostProcessFilterImpl rpf = new HostProcessFilterImpl(filterString); IRemoteProcessContext context = new RemoteProcessContext(this, null, rpf); IRemoteProcess[] ps = null;