diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-11-30 00:43:01 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-11-30 00:43:01 +0000 |
| commit | c0516766a25f4de8163ecbba60f0544bb0a4dee2 (patch) | |
| tree | c47b9db85820a559adcca027860f98ec220dfa28 | |
| parent | b12c9d93903c928f16806e28d1c2208a939d615c (diff) | |
| download | ATCD-c0516766a25f4de8163ecbba60f0544bb0a4dee2.tar.gz | |
ChangeLogTag: Fri Nov 29 19:42:12 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp | 3 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 7 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Connector.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Strategies/SHMIOP_Connector.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Strategies/UIOP_Connector.cpp | 2 |
6 files changed, 21 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 73bf1f5266d..28c4de04428 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Nov 29 19:42:12 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp: + * orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.cpp: + * tao/Strategies/SHMIOP_Connection_Handler.cpp: + * tao/Strategies/UIOP_Connection_Handler.cpp: Replicated the changes + in IIOP to the above protocols. Need to refactor this code. + Fri Nov 29 19:30:20 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * tao/Connect_Strategy.h: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp index f64aa2a6b8c..e02f8eff703 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp @@ -228,6 +228,9 @@ TAO_IIOP_SSL_Connector::make_connection ( iiop_endpoint->port (), ACE_TEXT ("errno"))); } + + (void) this->active_connect_strategy_->post_failed_connect (svc_handler); + return -1; } diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 95cf6d7263e..a186c325bc8 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -131,9 +131,9 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, ACE_ENV_ARG_DECL) { return this->connect (invocation, - desc, - 0 - ACE_ENV_ARG_PARAMETER); + desc, + 0 + ACE_ENV_ARG_PARAMETER); } int @@ -563,6 +563,7 @@ TAO_SSLIOP_Connector::ssliop_connect (TAO_SSLIOP_Endpoint *ssl_endpoint, ACE_TEXT ("errno"))); } + (void) this->active_connect_strategy_->post_failed_connect (svc_handler); return -1; } diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp index 0f3a1cbebcf..4eb2e2a4073 100644 --- a/TAO/tao/IIOP_Connector.cpp +++ b/TAO/tao/IIOP_Connector.cpp @@ -212,7 +212,7 @@ TAO_IIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, "errno")); } - this->active_connect_strategy_->post_failed_connect (svc_handler); + (void) this->active_connect_strategy_->post_failed_connect (svc_handler); return -1; } diff --git a/TAO/tao/Strategies/SHMIOP_Connector.cpp b/TAO/tao/Strategies/SHMIOP_Connector.cpp index 02607719182..3a68ff6c185 100644 --- a/TAO/tao/Strategies/SHMIOP_Connector.cpp +++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp @@ -228,6 +228,9 @@ TAO_SHMIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, buffer, ACE_TEXT ("errno"))); } + + (void) this->active_connect_strategy_->post_failed_connect (svc_handler); + return -1; } diff --git a/TAO/tao/Strategies/UIOP_Connector.cpp b/TAO/tao/Strategies/UIOP_Connector.cpp index 93cc8e548d1..8c4df62440e 100644 --- a/TAO/tao/Strategies/UIOP_Connector.cpp +++ b/TAO/tao/Strategies/UIOP_Connector.cpp @@ -214,6 +214,8 @@ TAO_UIOP_Connector::make_connection (TAO_GIOP_Invocation *invocation, uiop_endpoint->rendezvous_point (), ACE_TEXT ("errno"))); } + + (void) this->active_connect_strategy_->post_failed_connect (svc_handler); return -1; } |