diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-11-03 21:55:51 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-11-03 21:55:51 +0000 |
| commit | 93d038ae6e8c20cc3599403069c2b6b1b30dc793 (patch) | |
| tree | f7496e9f84344e182fcade42d20487175d9241c4 | |
| parent | b7b0bdd89096ca28fc199f36e7b0b2c1e47b8e16 (diff) | |
| download | ATCD-93d038ae6e8c20cc3599403069c2b6b1b30dc793.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/tao/Connection_Cache_Manager.cpp | 12 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 5 |
2 files changed, 9 insertions, 8 deletions
diff --git a/TAO/tao/Connection_Cache_Manager.cpp b/TAO/tao/Connection_Cache_Manager.cpp index e7a22468a5a..aed188ce08f 100644 --- a/TAO/tao/Connection_Cache_Manager.cpp +++ b/TAO/tao/Connection_Cache_Manager.cpp @@ -48,8 +48,8 @@ TAO_Connection_Cache_Manager::bind_i (TAO_Cache_ExtId &ext_id, { ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t) TAO_Connection_Cache_Manager::bind_i") - ACE_TEXT (" unable to bind in the first attempt") - ACE_TEXT (" so trying with a new index \n"))); + ACE_TEXT (" unable to bind in the first attempt \n") + ACE_TEXT (" So trying with a new index \n"))); } // There was an entry like this before, so let us do some @@ -58,7 +58,10 @@ TAO_Connection_Cache_Manager::bind_i (TAO_Cache_ExtId &ext_id, int_id, entry); if (retval == 0) - int_id.handler ()->cache_map_entry (entry); + { + int_id.handler ()->cache_map_entry (entry); + int_id.recycle_state (ACE_RECYCLABLE_BUSY); + } } if (TAO_debug_level > 0 && retval != 0) @@ -243,6 +246,7 @@ TAO_Connection_Cache_Manager:: // Set the index key.index (ctr + 1); + cout << "The counter is " << ctr + 1 <<endl; // Now do a bind again with the new index return this->cache_map_.bind (key, val, @@ -265,12 +269,14 @@ TAO_Connection_Cache_Manager:: // Save that in the handler entry->int_id_.handler ()->cache_map_entry (entry); + cout << "Are we 2 "<<endl; // Mark the connection as busy entry->int_id_.recycle_state (ACE_RECYCLABLE_BUSY); return 0; } else { + cout << "Are we 1 "<<endl; entry = entry->next_; } } diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 9d57f81586e..e8c41e9d32a 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -253,7 +253,6 @@ TAO_IIOP_Connector::connect (TAO_Base_Connection_Property *prop, this->orb_core ()->connection_cache ().cache_handler (prop, svc_handler); - if (retval != 0 && TAO_debug_level > 0) { ACE_DEBUG ((LM_DEBUG, @@ -262,10 +261,6 @@ TAO_IIOP_Connector::connect (TAO_Base_Connection_Property *prop, } } - - // Make the handler ready for use - svc_handler->make_idle (); - transport = svc_handler->transport (); return 0; } |