[jbosstools-commits] JBoss Tools SVN: r32699 - in trunk/as/plugins: org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core and 1 other directory.

Author: adietish Date: 2011-07-07 08:30:27 -0400 (Thu, 07 Jul 2011) New Revision: 32699 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java Log: [JBIDE-9215] avoided infinitie loops when setting server state by consequently calling the delegating server behavior (instead of calling #setServerStarting/#setServerStopping which then would call the delegating behavior which then would call the delegate again etc.) Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-07 12:18:25 UTC (rev 32698) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/LocalJBossBehaviorDelegate.java 2011-07-07 12:30:27 UTC (rev 32699) @@ -80,7 +80,7 @@ return; } - setServerStopping(); + getActualBehavior().setServerStopping(); gracefullStop(); } @@ -196,13 +196,20 @@ && !process.isTerminated(); } + /** + * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStarting()} instead. + * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop. + */ public void setServerStarting() { nextStopRequiresForce = false; pollServer(IServerStatePoller.SERVER_UP); } + /** + * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStopping()} instead. + * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop. + */ public void setServerStopping() { - getActualBehavior().setServerStopping(); pollServer(IServerStatePoller.SERVER_DOWN); } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-07 12:18:25 UTC (rev 32698) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/AbstractRSEBehaviourDelegate.java 2011-07-07 12:30:27 UTC (rev 32699) @@ -45,10 +45,18 @@ } } + /** + * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStarting()} instead. + * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop. + */ public void setServerStarting() { pollServer(IServerStatePoller.SERVER_UP); } + /** + * ATTENTION: don't call this directly, use {@link #getActualBehavior().getServerStopping()} instead. + * if we would call the delegating server behavior here to set it's state, we would cause an infinite loop. + */ public void setServerStopping() { pollServer(IServerStatePoller.SERVER_DOWN); } 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-07 12:18:25 UTC (rev 32698) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.rse.core/src/org/jboss/ide/eclipse/as/rse/core/RSEBehaviourDelegate.java 2011-07-07 12:30:27 UTC (rev 32699) @@ -28,7 +28,7 @@ @Override protected void forceStop() { - serverStopped(); + getActualBehavior().setServerStopped(); return; } @@ -60,16 +60,7 @@ pollServer(IServerStatePoller.SERVER_UP); } - public void serverStarted() { - getActualBehavior().setServerStarted(); - } - public void setServerStopping() { - getActualBehavior().setServerStopping(); pollServer(IServerStatePoller.SERVER_DOWN); } - - public void serverStopped() { - getActualBehavior().setServerStopped(); - } }