Author: adietish Date: 2011-07-08 10:18:41 -0400 (Fri, 08 Jul 2011) New Revision: 32761 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java Log: [JBIDE-9215] moved shell checks to RSEUtils#isActive(IHostShell) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:15:38 UTC (rev 32760) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-08 14:18:41 UTC (rev 32761) @@ -19,6 +19,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.Status; import org.eclipse.debug.core.ILaunchConfiguration; +import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.wst.server.core.IServer; import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; import org.jboss.ide.eclipse.as.core.server.IServerStatePoller; @@ -38,7 +39,8 @@ String shutdownCommand = getShutdownCommand(getServer()); ServerShellModel model = RSEHostShellModel.getInstance().getModel(getServer()); model.executeRemoteCommand("/", shutdownCommand, new String[]{}, new NullProgressMonitor(), 10000, true); - if( model.getStartupShell() != null && model.getStartupShell().isActive()) { + IHostShell shell = model.getStartupShell(); + if( RSEUtils.isActive(shell)) { model.getStartupShell().writeToShell("exit"); } return Status.OK_STATUS; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-07-08 14:15:38 UTC (rev 32760) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEUtils.java 2011-07-08 14:18:41 UTC (rev 32761) @@ -18,6 +18,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.rse.core.RSECorePlugin; import org.eclipse.rse.core.model.IHost; +import org.eclipse.rse.services.shells.IHostShell; import org.eclipse.wst.server.core.IServer; import org.eclipse.wst.server.core.IServerAttributes; import org.eclipse.wst.server.core.IServerWorkingCopy; @@ -170,5 +171,10 @@ IDeployableServer.DEPLOY_SERVER); return wc.save(false, new NullProgressMonitor()); } + + public static boolean isActive(IHostShell shell) { + return shell != null + && shell.isActive(); + } }