added max check in accumulation

2 files changed, 10 insertions, 6 deletions

diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Forward_Ranking_Scheduler.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Forward_Ranking_Scheduler.cpp
index 72427628806..397367e4352 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Forward_Ranking_Scheduler.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/Forward_Ranking_Scheduler.cpp
@@ -100,7 +100,7 @@ Forward_Ranking_Scheduler::update_schedule (const Task & task,
 
 void 
 Forward_Ranking_Scheduler::update_failure_map (const Task & task,
-                                               const Processor & processor)
+                                               const Processor & /* processor */)
 {
   PROCESSOR_SET proc_dependencies;
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/schedulability_check.cpp b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/schedulability_check.cpp
index 0cbe63bb783..cd57eda5114 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/schedulability_check.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/FLARe/DeCoRAM/src/schedulability_check.cpp
@@ -68,15 +68,19 @@ public:
 
   double operator () (double previous, const SCHEDULE::value_type & entry)
   {
+    if (previous == .0)
+      return .0;
+
     PROCESSOR_SETS scenarios = 
       this->calculate_failure_scenarions (entry.first,
                                           max_rank_);
 
-    return std::accumulate (scenarios.begin (),
-                            scenarios.end (),
-                            -1.0,
-                            FailureAwareWCRT (entry.second,
-                                              replica_groups_));
+    return std::max(std::accumulate (scenarios.begin (),
+                                     scenarios.end (),
+                                     -1.0,
+                                     FailureAwareWCRT (entry.second,
+                                                       replica_groups_)),
+                    previous);
   }
 
 private: