[jbosstools-commits] JBoss Tools SVN: r8242 - in trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server: internal and 1 other directory.

Author: rob.stryker(a)jboss.com Date: 2008-05-20 16:31:30 -0400 (Tue, 20 May 2008) New Revision: 8242 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerPollingAttributes.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java Log: JBIDE-2239 - working with changed timeout structure Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerPollingAttributes.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerPollingAttributes.java 2008-05-20 19:46:17 UTC (rev 8241) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IServerPollingAttributes.java 2008-05-20 20:31:30 UTC (rev 8242) @@ -26,15 +26,8 @@ * @author Rob Stryker */ public interface IServerPollingAttributes { - public static final String START_TIMEOUT = "org.jboss.ide.eclipse.as.core.server.attributes.startTimeout"; - public static final String STOP_TIMEOUT = "org.jboss.ide.eclipse.as.core.server.attributes.stopTimeout"; - - public static final String TIMEOUT_BEHAVIOR = "org.jboss.ide.eclipse.as.core.server.attributes.timeoutBehavior"; public static final String STARTUP_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.startupPollerKey"; public static final String SHUTDOWN_POLLER_KEY = "org.jboss.ide.eclipse.as.core.server.attributes.shutdownPollerKey"; public static final String DEFAULT_STARTUP_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.JMXPoller"; public static final String DEFAULT_SHUTDOWN_POLLER = "org.jboss.ide.eclipse.as.core.runtime.server.processTerminatedPoller"; - public static final boolean TIMEOUT_ABORT = true; - public static final boolean TIMEOUT_IGNORE = false; - } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2008-05-20 19:46:17 UTC (rev 8241) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/PollThread.java 2008-05-20 20:31:30 UTC (rev 8242) @@ -116,7 +116,7 @@ if( poller == null ) { alertEventLogStarting(); alertPollerNotFound(); - alertBehavior(getTimeoutBehavior(), false); + alertBehavior(!expectedState, false); return; } @@ -178,6 +178,7 @@ try { currentState = poller.getState(); poller.cleanup(); + alertBehavior(currentState, finalAlert); } catch( PollingException pe) { // abort and put the message in event log poller.cancel(IServerStatePoller.CANCEL); @@ -191,12 +192,19 @@ } else { // we timed out. get response from preferences poller.cancel(IServerStatePoller.TIMEOUT_REACHED); - currentState = getTimeoutBehavior(); + int behavior = poller.getTimeoutBehavior(); poller.cleanup(); alertEventLogTimeout(); - finalAlert = false; + if( behavior != IServerStatePoller.TIMEOUT_BEHAVIOR_IGNORE) { + // xnor; + // if behavior is to succeed and we're expected to go up, we're up + // if behavior is to fail and we're expecting to be down, we're up (failed to shutdown) + // all other cases, we're down. + currentState = (expectedState == (behavior == IServerStatePoller.TIMEOUT_BEHAVIOR_SUCCEED)); + finalAlert = false; + alertBehavior(currentState, finalAlert); + } } - alertBehavior(currentState, finalAlert); } } @@ -222,18 +230,6 @@ } } - protected boolean getTimeoutBehavior() { - // timeout has been reached, so let the user's preferences override - JBossServer jbs = ((JBossServer)getServer().loadAdapter(JBossServer.class, null)); - ServerAttributeHelper helper = (ServerAttributeHelper)jbs.getAttributeHelper(); - - boolean behavior = helper.getAttribute(IServerPollingAttributes.TIMEOUT_BEHAVIOR, IServerPollingAttributes.TIMEOUT_IGNORE); - if( behavior == IServerPollingAttributes.TIMEOUT_ABORT ) - return !expectedState; - - return expectedState; - } - protected IServer getServer() { return behavior.getServer(); }