Author: adietish Date: 2011-07-08 07:09:24 -0400 (Fri, 08 Jul 2011) New Revision: 32754 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java Log: [JBIDE-9215] always canceling polling when new polling is requested Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-08 11:07:29 UTC (rev 32753) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/AbstractJBossBehaviourDelegate.java 2011-07-08 11:09:24 UTC (rev 32754) @@ -87,11 +87,13 @@ } protected void pollServer(final boolean expectedState) { + stopPolling(); IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); this.pollThread = PollThreadUtils.pollServer(expectedState, poller , pollThread, actualBehavior); } protected void pollServer(boolean expectedState, IServerStatePoller poller) { + stopPolling(); this.pollThread = PollThreadUtils.pollServer(expectedState, poller, pollThread, actualBehavior); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-08 11:07:29 UTC (rev 32753) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/v7/LocalJBoss7BehaviorDelegate.java 2011-07-08 11:09:24 UTC (rev 32754) @@ -25,12 +25,11 @@ @Override protected void pollServer(final boolean expectedState) { - stopPolling(); - IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); // IF shutting down a process started OUTSIDE of eclipse, force use the web poller, // since there's no process watch for shutdowns if( !expectedState && process == null ) { + IServerStatePoller poller = PollThreadUtils.getPoller(expectedState, getServer()); poller = PollThreadUtils.getPoller(WebPortPoller.WEB_POLLER_ID); pollServer(expectedState, poller); } else {