JBoss Tools SVN: r29186 - trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core.
by jbosstools-commits@lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2011-02-16 16:42:43 -0500 (Wed, 16 Feb 2011)
New Revision: 29186
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
Log:
JBIDE-8438 committed to trunk
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-02-16 21:26:58 UTC (rev 29185)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSELaunchDelegate.java 2011-02-16 21:42:43 UTC (rev 29186)
@@ -122,7 +122,8 @@
IShellService service = null;
try {
service = findShellService(behaviour);
- } catch(CoreException ce) {
+ service.initService(new NullProgressMonitor());
+ } catch(Exception ce) {
// TODO log and return
return;
}
@@ -130,6 +131,7 @@
final IHostShell hs = service.runCommand("/", command, new String[]{}, new NullProgressMonitor());
if( hs != null ) {
delay(delay/1000);
+ hs.exit();
}
} catch( SystemMessageException sme) {
// TODO
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-02-16 21:26:58 UTC (rev 29185)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEPublishMethod.java 2011-02-16 21:42:43 UTC (rev 29186)
@@ -76,13 +76,13 @@
protected void startDeploymentScanner() {
String cmd = getDeploymentScannerCommand(new NullProgressMonitor(), true);
if( cmd != null )
- RSELaunchDelegate.launchCommandNoResult((JBossServerBehavior)behaviour, 1000, cmd);
+ RSELaunchDelegate.launchCommandNoResult((JBossServerBehavior)behaviour, 3000, cmd);
}
protected void stopDeploymentScanner() {
String cmd = getDeploymentScannerCommand(new NullProgressMonitor(), false);
if( cmd != null )
- RSELaunchDelegate.launchCommandNoResult((JBossServerBehavior)behaviour, 1000, cmd);
+ RSELaunchDelegate.launchCommandNoResult((JBossServerBehavior)behaviour, 3000, cmd);
}
protected String getDeploymentScannerCommand(IProgressMonitor monitor, boolean start) {