summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-09 19:53:34 +0000
committermarina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-04-09 19:53:34 +0000
commita7341107cc3be5b856492d6266ee829d17956765 (patch)
tree5e12fe5ebf6634c9bae9a4b7fa40751549f9d504
parent7fb806ee967303031ccabbb2564c665ef3259d01 (diff)
downloadATCD-a7341107cc3be5b856492d6266ee829d17956765.tar.gz
*** empty log message ***
-rw-r--r--TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp24
1 files changed, 15 insertions, 9 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
index ab443970f19..5944f4995ed 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index_T.cpp
@@ -118,8 +118,6 @@ TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::open (LPCTSTR file_name,
{
this->base_address_ = base_address;
- ACE_DEBUG ((LM_DEBUG, "The base mapping address is : %X \n", base_address_));
-
index_file_ = ACE_OS::strdup (file_name);
if (index_file_ == 0)
return -1;
@@ -206,15 +204,21 @@ TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::init (void)
template <ACE_MEM_POOL_1, class ACE_LOCK> int
TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::recreate_all (void)
{
- INDEX::ITERATOR * index_iter = 0;
+ ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
+ TAO_Persistent_Index_IntId>::ITERATOR * index_iter = 0;
ACE_NEW_RETURN (index_iter,
- INDEX::ITERATOR (*index_),
+ (ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId, TAO_Persistent_Index_IntId>::ITERATOR) (*index_),
-1);
- ACE_Auto_Basic_Ptr<INDEX::ITERATOR> it (index_iter);
+ ACE_Auto_Basic_Ptr<ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
+ TAO_Persistent_Index_IntId>::ITERATOR> it (index_iter);
+
+ ACE_Shared_Hash_Map<TAO_Persistent_Index_ExtId,
+ TAO_Persistent_Index_IntId>::ENTRY *entry = 0;
- INDEX::ENTRY *entry = 0;
+ if (TAO_debug_level > 0)
+ ACE_DEBUG ((LM_DEBUG, "Starting to recreate Naming Contexts from the file... \n"));
do
{
@@ -263,9 +267,11 @@ TAO_Persistent_Context_Index<ACE_MEM_POOL_2, ACE_LOCK>::recreate_all (void)
orb_->object_to_string (result.in (), ACE_TRY_ENV);
ACE_TRY_CHECK;
- ACE_DEBUG ((LM_DEBUG, "Context_Index init from file: poa_id %s \n", entry->ext_id_.poa_id_));
- ACE_DEBUG ((LM_DEBUG, "Context_Index init from file: counter %d \n", (*(c_impl->counter_))));
-
+ if (TAO_debug_level > 0)
+ ACE_DEBUG ((LM_DEBUG,
+ "Recreating Naming Context with poa_id %s and counter %d\n",
+ entry->ext_id_.poa_id_,
+ (*(c_impl->counter_))));
}
ACE_CATCHANY
{