diff options
author | bala <balanatarajan@users.noreply.github.com> | 2002-04-26 17:57:13 +0000 |
---|---|---|
committer | bala <balanatarajan@users.noreply.github.com> | 2002-04-26 17:57:13 +0000 |
commit | 3c70935aaa5e00ecef59f8f500fb57b6b61ec5ca (patch) | |
tree | a0842ce3e1a6e9da12545f418f9c66d6fc8c7fad | |
parent | 0e7eef4ae37bd1772295dfef448838d83da19577 (diff) | |
download | ATCD-3c70935aaa5e00ecef59f8f500fb57b6b61ec5ca.tar.gz |
ChangeLogTag: Fri Apr 26 12:53:13 2002 Balachandran Natarajan <bala@guajira.cs.wustl.edu>
-rw-r--r-- | TAO/tao/ChangeLog | 5 | ||||
-rw-r--r-- | TAO/tao/IIOP_Connection_Handler.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/Transport_Connector.cpp | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/TAO/tao/ChangeLog b/TAO/tao/ChangeLog index 8443e86cf66..36b5df5dfb1 100644 --- a/TAO/tao/ChangeLog +++ b/TAO/tao/ChangeLog @@ -1,3 +1,8 @@ +Fri Apr 26 12:53:13 2002 Balachandran Natarajan <bala@guajira.cs.wustl.edu> + + * tao/IIOP_Connector.cpp: + * tao/IIOP_Connection_Handler.cpp: Removed vague debug statement + Tue Apr 23 12:16:01 2002 Balachandran Natarajan <bala@cs.wustl.edu> * tao/Connection_Handler.cpp: diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp index db385c79c73..fb8819e806f 100644 --- a/TAO/tao/IIOP_Connection_Handler.cpp +++ b/TAO/tao/IIOP_Connection_Handler.cpp @@ -57,7 +57,6 @@ TAO_IIOP_Connection_Handler::TAO_IIOP_Connection_Handler (TAO_ORB_Core *orb_core TAO_IIOP_Connection_Handler::~TAO_IIOP_Connection_Handler (void) { - cout << " I am going " << endl; } int @@ -135,6 +134,7 @@ TAO_IIOP_Connection_Handler::open (void*) this->transport ()->id ((int) this->get_handle ()); this->state_changed (TAO_LF_Event::LFS_SUCCESS); + return 0; } diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 207b101ac73..c84819450c1 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -160,7 +160,7 @@ TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, // Get the max_wait_time - // @@todo: Right place for Jon reis stuff!! + // @@todo: Right place for Jon Reis stuff!! ACE_Time_Value *max_wait_time = invocation->max_wait_time (); @@ -185,8 +185,6 @@ TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, max_wait_time); } - - cout << "Asked to go " << endl; // Reduce the refcount to the svc_handler that we have. The // increment to the handler is done in make_svc_handler (). Now // that we dont need the reference to it anymore we can decrement diff --git a/TAO/tao/Transport_Connector.cpp b/TAO/tao/Transport_Connector.cpp index 0d20a2d627c..6a61efb9a60 100644 --- a/TAO/tao/Transport_Connector.cpp +++ b/TAO/tao/Transport_Connector.cpp @@ -223,7 +223,7 @@ TAO_Connector::connect (TAO_GIOP_Invocation *invocation, { if (TAO_debug_level > 2) ACE_DEBUG ((LM_DEBUG, - ACE_LIB_TEXT ("(%P|%t) IIOP_Connector::connect - ") + ACE_LIB_TEXT ("(%P|%t) Transport_Connector::connect - ") ACE_LIB_TEXT ("got an existing transport with id %d\n"), base_transport->id ())); @@ -238,7 +238,7 @@ TAO_Connector::connect (TAO_GIOP_Invocation *invocation, return 0; } - // @@TODO: This is not the right place for this! -- Bala + // @@TODO: This is not the right place for this! // Purge connections (if necessary) this->orb_core_->lane_resources ().transport_cache ().purge (); @@ -250,6 +250,7 @@ TAO_Connector::connect (TAO_GIOP_Invocation *invocation, void TAO_Connector::create_connect_strategy (void) { + // @@ todo:Not exception safe! if (this->active_connect_strategy_ == 0) { this->active_connect_strategy_ = |