[jboss-cvs] jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ...

[Robert Stryker]

  User: rawb    
  Date: 06/07/13 00:39:55

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server 
                        ServerStateChecker.java
  Log:
  Early start of this thread caused it to cancel itself right away when it found no sever start processes in the process model for this server. That check was added in case the minimal configuration is started and stopped and the checker is still attempting to see if it's up or down. If all start threads are terminated, give up right away.  Early start of this thread meant no start processes were present, and instant short. 
  
  Revision  Changes    Path
  1.9       +12 -2     jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ServerStateChecker.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- ServerStateChecker.java	13 Jul 2006 04:15:11 -0000	1.8
  +++ ServerStateChecker.java	13 Jul 2006 04:39:55 -0000	1.9
  @@ -30,6 +30,7 @@
   import org.jboss.ide.eclipse.as.core.model.ServerProcessLog.ProcessLogEvent;
   import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ProcessData;
   import org.jboss.ide.eclipse.as.core.model.ServerProcessModel.ServerProcessModelEntity;
  +import org.jboss.ide.eclipse.as.core.util.ASDebug;
   
   public class ServerStateChecker extends Thread implements IServerProcessListener {
   
  @@ -74,6 +75,7 @@
   	
   	public void cancel() {
   		canceled = true;
  +		ASDebug.p("canceled called", this);
   	}
   	
   	public void run() {
  @@ -92,11 +94,19 @@
   		while( current < max && twiddleResults != expectedState && !canceled) {
   			// short circuit
   			if( jbServer.getServer().getServerState() == IServer.STATE_STOPPED || 
  -					jbServer.getServer().getServerState() == IServer.STATE_STARTED) { canceled = true; }
  +					jbServer.getServer().getServerState() == IServer.STATE_STARTED) { 
  +				ASDebug.p("server state is " + jbServer.getServer().getServerState(), this);
  +				canceled = true; 
  +			}
   
   			if( ServerProcessModel.allProcessesTerminated(ent.getProcesses(ServerProcessModel.START_PROCESSES))) {
  +				// this thread may have started early, before the other thread was launched. 
  +				// Give it 15 seconds
  +				if( current > 15000 ) {
  +					ASDebug.p("canceled - processes terminated", this);
   				canceled = true;
   			}
  +			}
   			
   			int res = getTwiddleResults(ent, jbServer, args);
   			if( res == STATE_TRUE ) {