ChangeLogTag: Fri May 18 14:23:22 2001 Chad Elliott <elliott_c@ociweb.com>

1 files changed, 9 insertions, 12 deletions

diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
index b22b9825493..90155a43237 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
@@ -1,34 +1,31 @@
 // $Id$
 
 #include "FIFO_Connection_Purging_Strategy.h"
+#include "tao/Cache_Entries.h"
 
 ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$")
 
 TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
-                                               TAO_Resource_Factory* rf)
- : TAO_ULong_Connection_Purging_Strategy (rf),
+                                                            int cache_maximum)
+ : TAO_Connection_Purging_Strategy (cache_maximum),
    order_ (0)
 {
 }
 
 
-TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy ()
+TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy (void)
 {
 }
 
 
 void
-TAO_FIFO_Connection_Purging_Strategy::update_item_i (
-                                       TAO_DESCRIPTOR_INTERFACE* prop,
-                                       TAO_PURGING_CACHE_ITEM* item)
+TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Cache_IntId& int_id)
 {
-  ACE_UNUSED_ARG (item);
-  TAO_Cache_ExtId ext_id (prop);
-  ATTRIBUTE_TYPE int_id (this->order_);
-  if (this->tracking_map ().find (ext_id, int_id) != 0)
+  // FIFO, so only update the purging order if this
+  // item has not been cached yet.
+  if (int_id.purging_order () == 0)
     {
-      this->tracking_map ().bind(ext_id, int_id);
-      this->order_++;
+      int_id.purging_order (++(this->order_));
     }
 }