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

[Robert Stryker]

  User: rawb    
  Date: 07/01/11 10:55:01

  Modified:    as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling  
                        PollThread.java TwiddlePoller.java
  Log:
  Removed unused private field in TwiddlePoller.
  Added finalAlert boolean which is used during timeout
  
  Revision  Changes    Path
  1.5       +4 -3      jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PollThread.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/PollThread.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- PollThread.java	22 Nov 2006 21:41:42 -0000	1.4
  +++ PollThread.java	11 Jan 2007 15:55:01 -0000	1.5
  @@ -110,7 +110,7 @@
   			poller.cleanup();
   			alertEventLogAbort();
   		} else {
  -		
  +			boolean finalAlert = true;
   			if( done ) {
   				// the poller has an answer
   				currentState = poller.getState();
  @@ -122,18 +122,19 @@
   				poller.cleanup();
   				alertEventLogTimeout();
   				fireTimeoutEvent();
  +				finalAlert = false;
   			}
   			
   			if( currentState != expectedState ) {
   				// it didnt work... cancel all processes! force stop
   				behavior.stop(true);
  -				alertEventLogFailure();
  +				if( finalAlert ) alertEventLogFailure();
   			} else {
   				if( currentState == IServerStatePoller.SERVER_UP ) 
   					behavior.setServerStarted();
   				else
   					behavior.setServerStopped();
  -				alertEventLogSuccess(currentState);
  +				if( finalAlert ) alertEventLogSuccess(currentState);
   			}
   		}
   	}
  
  
  
  1.4       +2 -2      jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/TwiddlePoller.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: TwiddlePoller.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/runtime/server/polling/TwiddlePoller.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- TwiddlePoller.java	22 Nov 2006 21:41:42 -0000	1.3
  +++ TwiddlePoller.java	11 Jan 2007 15:55:01 -0000	1.4
  @@ -52,7 +52,6 @@
   	private boolean done;
   	private IServer server;
   	
  -	private PollerRunnable currentRunnable;
   	private EventLogTreeItem event;
   	public void beginPolling(IServer server, boolean expectedState, PollThread pt) {
   		this.expectedState = expectedState;
  @@ -96,6 +95,7 @@
   						} 
   					}
   				}
  +				if( !canceled )
   				eventTwiddleExecuted();
   			}
   		}