ChangeLogTag: Wed May 23 09:04:35 2001 Chad Elliott <elliott_c@ociweb.com>

6 files changed, 16 insertions, 14 deletions

diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
index 90155a43237..d1e9d6940b3 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
 #include "FIFO_Connection_Purging_Strategy.h"
-#include "tao/Cache_Entries.h"
+#include "tao/Transport.h"
 
 ACE_RCSID(tao, FIFO_Connection_Purging_Strategy, "$Id$")
 
 TAO_FIFO_Connection_Purging_Strategy::TAO_FIFO_Connection_Purging_Strategy (
                                                             int cache_maximum)
  : TAO_Connection_Purging_Strategy (cache_maximum),
-   order_ (0)
+   // Initialized to 1 to insure that the transports purging_order
+   // is only 0 upon initialization.
+   order_ (1)
 {
 }
 
@@ -19,13 +21,13 @@ TAO_FIFO_Connection_Purging_Strategy::~TAO_FIFO_Connection_Purging_Strategy (voi
 
 
 void
-TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Cache_IntId& int_id)
+TAO_FIFO_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
   // FIFO, so only update the purging order if this
   // item has not been cached yet.
-  if (int_id.purging_order () == 0)
+  if (transport->purging_order () == 0)
     {
-      int_id.purging_order (++(this->order_));
+      transport->purging_order (this->order_++);
     }
 }
 
diff --git a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
index 2ef03ec36b9..bf4ccffd314 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
@@ -43,7 +43,7 @@ public:
   virtual ~TAO_FIFO_Connection_Purging_Strategy (void);
 
   /// Called when accessing an item from the cache
-  virtual void update_item (TAO_Cache_IntId& int_id);
+  virtual void update_item (TAO_Transport* transport);
 
 private:
   /// The ordering information for each transport in the cache
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
index 9280d34e176..961ba767c8e 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "LFU_Connection_Purging_Strategy.h"
-#include "tao/Cache_Entries.h"
+#include "tao/Transport.h"
 
 ACE_RCSID(tao, LFU_Connection_Purging_Strategy, "$Id$")
 
@@ -18,8 +18,8 @@ TAO_LFU_Connection_Purging_Strategy::~TAO_LFU_Connection_Purging_Strategy (void)
 
 
 void
-TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Cache_IntId& int_id)
+TAO_LFU_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
-  int_id.purging_order (int_id.purging_order () + 1);
+  transport->purging_order (transport->purging_order () + 1);
 }
 
diff --git a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
index a5502d417a9..46ed221b08b 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
@@ -42,7 +42,7 @@ public:
   virtual ~TAO_LFU_Connection_Purging_Strategy (void);
 
   /// Called when accessing an item from the cache
-  virtual void update_item (TAO_Cache_IntId& int_id);
+  virtual void update_item (TAO_Transport* transport);
 };
 
 #include "ace/post.h"
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
index 44a5cd5336f..930c9c89053 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 #include "NULL_Connection_Purging_Strategy.h"
-#include "tao/Cache_Entries.h"
+#include "tao/Transport.h"
 
 ACE_RCSID(tao, NULL_Connection_Purging_Strategy, "$Id$")
 
@@ -18,9 +18,9 @@ TAO_NULL_Connection_Purging_Strategy::~TAO_NULL_Connection_Purging_Strategy (voi
 
 
 void
-TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Cache_IntId& int_id)
+TAO_NULL_Connection_Purging_Strategy::update_item (TAO_Transport* transport)
 {
-  ACE_UNUSED_ARG (int_id);
+  ACE_UNUSED_ARG (transport);
 }
 
 
diff --git a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
index 31a67c8bd22..bd7ffa27366 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
@@ -39,7 +39,7 @@ public:
   virtual ~TAO_NULL_Connection_Purging_Strategy (void);
 
   /// Does nothing.
-  virtual void update_item (TAO_Cache_IntId& int_id);
+  virtual void update_item (TAO_Transport* transport);
 
   /// Returns -1 to signify no maximum
   virtual int cache_maximum (void) const;