Author: rob.stryker(a)jboss.com Date: 2011-06-06 22:51:23 -0400 (Mon, 06 Jun 2011) New Revision: 31857 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java Log: JBIDE-9074 - to trunk for checking initial startup state and not starting a second time if server is already up. Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-07 02:43:07 UTC (rev 31856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/launch/LocalJBossServerStartupLaunchUtil.java 2011-06-07 02:51:23 UTC (rev 31857) @@ -38,6 +38,7 @@ import org.eclipse.wst.server.core.ServerCore; import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.Messages; +import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.IJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.AbstractLocalJBossServerRuntime; import org.jboss.ide.eclipse.as.core.server.internal.JBossServer; @@ -304,6 +305,13 @@ JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); if (!jbsBehavior.canStart(mode).isOK()) throw new CoreException(jbsBehavior.canStart(mode)); + boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); + if( started ) { + jbsBehavior.setServerStarting(); + jbsBehavior.setServerStarted(); + return false; + } + return true; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-06-07 02:43:07 UTC (rev 31856) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/JBoss7ServerStartupLaunchConfiguration.java 2011-06-07 02:51:23 UTC (rev 31857) @@ -16,6 +16,7 @@ import org.eclipse.debug.core.ILaunchConfiguration; import org.eclipse.debug.core.model.ILaunchConfigurationDelegate; import org.eclipse.debug.core.model.IProcess; +import org.jboss.ide.eclipse.as.core.extensions.polling.WebPortPoller; import org.jboss.ide.eclipse.as.core.server.internal.JBossServerBehavior; import org.jboss.ide.eclipse.as.core.server.internal.launch.JBossServerStartupLaunchConfiguration; import org.jboss.ide.eclipse.as.core.util.JBossServerBehaviorUtils; @@ -32,6 +33,13 @@ public boolean preLaunchCheck(ILaunchConfiguration configuration, String mode, IProgressMonitor monitor) throws CoreException { + JBossServerBehavior jbsBehavior = JBossServerBehaviorUtils.getServerBehavior(configuration); + boolean started = WebPortPoller.onePing(jbsBehavior.getServer()); + if( started ) { + jbsBehavior.setServerStarting(); + jbsBehavior.setServerStarted(); + return false; + } return true; }