*** empty log message ***

4 files changed, 23 insertions, 24 deletions

diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
index f52acf4cc53..d5a1d463277 100644
--- a/TAO/tao/Cache_Entries.h
+++ b/TAO/tao/Cache_Entries.h
@@ -134,6 +134,7 @@ public:
   // Make a deep copy of the underlying pointer
 
   CORBA::ULong index (void);
+  CORBA::ULong index (void) const;
   // Return the index value
 
   void index (CORBA::ULong index);
@@ -141,6 +142,8 @@ public:
   // but for the TAO_Connection_Cache_Manager class.
 
   // = Accessors
+  TAO_Base_Connection_Property *property (void) const;
+  // Get the underlying the property pointer
 
 private:
   // = Data members.
diff --git a/TAO/tao/Cache_Entries.inl b/TAO/tao/Cache_Entries.inl
index ed526caabe3..489bce8c010 100644
--- a/TAO/tao/Cache_Entries.inl
+++ b/TAO/tao/Cache_Entries.inl
@@ -157,8 +157,21 @@ TAO_Cache_ExtId::index (void)
   return this->index_;
 }
 
+ACE_INLINE CORBA::ULong
+TAO_Cache_ExtId::index (void) const
+{
+  return this->index_;
+}
+
+
 ACE_INLINE void
 TAO_Cache_ExtId::index (CORBA::ULong index)
 {
   this->index_ = index;
 }
+
+ACE_INLINE TAO_Base_Connection_Property *
+TAO_Cache_ExtId::property (void) const
+{
+  return this->connection_property_;
+}
diff --git a/TAO/tao/Connection_Cache_Manager.cpp b/TAO/tao/Connection_Cache_Manager.cpp
index 6bd4c0d18dc..fd7fb30c14b 100644
--- a/TAO/tao/Connection_Cache_Manager.cpp
+++ b/TAO/tao/Connection_Cache_Manager.cpp
@@ -1,6 +1,7 @@
 #include "tao/Connection_Cache_Manager.h"
 #include "tao/Connection_Handler.h"
 #include "tao/debug.h"
+#include "tao/ORB_Core.h"
 
 
 #if !defined (__ACE_INLINE__)
@@ -56,8 +57,6 @@ TAO_Connection_Cache_Manager::bind_i (TAO_Cache_ExtId &ext_id,
                                       entry);
   if (retval == 0)
     {
-      int_id.handler ()->test_index_ = ext_id.index ();
-
       // The entry has been added to cache succesfully
       // Add the cache_map_entry to the handler
       int_id.handler () ->cache_map_entry (entry);
@@ -121,21 +120,11 @@ TAO_Connection_Cache_Manager::find_i (const TAO_Cache_ExtId &key,
       // is idle it would be marked as busy.
       if (entry)
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%P|%t) ")
-                      ACE_TEXT ("Point 1 <%d> \n"),
-                          entry->int_id_.handler ()->test_index_));
-
           CORBA::Boolean idle =
             this->is_entry_idle (entry);
 
           if (idle)
             {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("(%P|%t) ")
-                          ACE_TEXT ("Point 2 <%d> \n"),
-                          entry->int_id_.handler ()->test_index_));
-
               // We have a succesful entry
               value = entry->int_id_;
               return 0;
@@ -197,10 +186,6 @@ TAO_Connection_Cache_Manager::make_idle_i (HASH_MAP_ENTRY *&entry)
                                       new_entry);
   if (retval == 0)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) ")
-                  ACE_TEXT ("We are getting  idle <%d> \n"),
-                  entry->int_id_.handler ()->test_index_));
 
       new_entry->int_id_.
         recycle_state (ACE_RECYCLABLE_IDLE_AND_PURGABLE);
@@ -302,8 +287,6 @@ TAO_Connection_Cache_Manager::
         this->cache_map_.find (key);
     }
 
-  val.handler ()->test_index_ = ctr;
-
   // Now do a bind again with the new index
   return  this->cache_map_.bind (key,
                                  val,
@@ -318,11 +301,6 @@ TAO_Connection_Cache_Manager::
   if (entry->int_id_.recycle_state () == ACE_RECYCLABLE_IDLE_AND_PURGABLE ||
       entry->int_id_.recycle_state () == ACE_RECYCLABLE_IDLE_BUT_NOT_PURGABLE)
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) ")
-                  ACE_TEXT ("I got this Handler <%d> \n"),
-                  entry->int_id_.handler ()->test_index_));
-
       // Save that in the handler
       entry->int_id_.handler ()->cache_map_entry (entry);
 
@@ -335,6 +313,8 @@ TAO_Connection_Cache_Manager::
   return 0;
 }
 
+
+
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
   // Instantiations for the Hash Map
diff --git a/TAO/tao/Connection_Handler.inl b/TAO/tao/Connection_Handler.inl
index 7a4f44271f3..fb11355f43f 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -4,7 +4,10 @@
 ACE_INLINE
 TAO_Connection_Handler::TAO_Connection_Handler (void)
   : orb_core_ (0),
-    tss_resources_ (0)
+    tss_resources_ (0),
+    ref_count_ (1),
+    cache_map_entry_ (0),
+    is_registered_ (0)
 {
 }