[Ccnet-checkins] SF.net SVN: ccnet: [2530] trunk/project/core/Triggers/ProjectTrigger.cs

[<dpi...@us...>]

Revision: 2530
          http://svn.sourceforge.net/ccnet/?rev=2530&view=rev
Author:   dpiessens
Date:     2006-09-02 09:23:06 -0700 (Sat, 02 Sep 2006)

Log Message:
-----------
Fixed minor glitch with ProjectTrigger not firing when multiple ProjectTriggers are present. Code now matches other trigger patterns.

Modified Paths:
--------------
    trunk/project/core/Triggers/ProjectTrigger.cs

Modified: trunk/project/core/Triggers/ProjectTrigger.cs
===================================================================
--- trunk/project/core/Triggers/ProjectTrigger.cs	2006-09-02 16:05:58 UTC (rev 2529)
+++ trunk/project/core/Triggers/ProjectTrigger.cs	2006-09-02 16:23:06 UTC (rev 2530)
@@ -13,6 +13,7 @@
 
 		private readonly ICruiseManagerFactory managerFactory;
 		private ProjectStatus lastStatus;
+		private ProjectStatus currentStatus;
 
 		public ProjectTrigger() : this(new RemoteCruiseManagerFactory())
 		{}
@@ -36,6 +37,7 @@
 
 		public void IntegrationCompleted()
 		{
+			lastStatus = currentStatus;
 			InnerTrigger.IntegrationCompleted();
 		}
 
@@ -66,9 +68,9 @@
 		{
 			IntegrationRequest request = InnerTrigger.Fire();
 			if (request == null) return null;
-			IntegrationCompleted();	// reset inner trigger
+			InnerTrigger.IntegrationCompleted(); // reset inner trigger (timer)
 
-			ProjectStatus currentStatus = GetCurrentProjectStatus();
+			currentStatus = GetCurrentProjectStatus();
 			if (lastStatus == null)
 			{
 				lastStatus = currentStatus;
@@ -76,7 +78,6 @@
 			}
 			if (currentStatus.LastBuildDate > lastStatus.LastBuildDate && currentStatus.BuildStatus == TriggerStatus)
 			{
-				lastStatus = currentStatus;
 				return request;
 			}
 			return null;		


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.