diff options
| author | Milan Cvetkovic <milan.cvetkovic@mpathix.com> | 2018-01-24 11:21:56 -0500 |
|---|---|---|
| committer | Milan Cvetkovic <milan.cvetkovic@mpathix.com> | 2018-01-24 11:21:56 -0500 |
| commit | f776ce71367a69b891db4164f744d62b2ca06205 (patch) | |
| tree | 75f8b7bb70c7443b7a2c78d15950fe21f7d2a8c9 /TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | |
| parent | 287883987b9e14e78bed1a9074507f88ec6b19d2 (diff) | |
| parent | ed1925da7c384e5773b9dbf56cab8e4924d4342a (diff) | |
| download | ATCD-f776ce71367a69b891db4164f744d62b2ca06205.tar.gz | |
Merge tag 'ACE+TAO-6_4_6' into ssliop_corbaloc_parser_comma_fix
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp')
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index e67b7d3153d..6aebd8005d2 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -671,14 +671,16 @@ TAO::SSLIOP::Connector::ssliop_connect ( return 0; } + TAO_Leader_Follower &leader_follower = this->orb_core ()->leader_follower (); + // fix for bug 2654 - if (svc_handler->keep_waiting ()) + if (svc_handler->keep_waiting (leader_follower)) { svc_handler->connection_pending (); } // fix for bug 2654 - if (svc_handler->error_detected ()) + if (svc_handler->error_detected (leader_follower)) { svc_handler->cancel_pending_connection (); } @@ -732,7 +734,7 @@ TAO::SSLIOP::Connector::ssliop_connect ( } // fix for bug 2654 - if (svc_handler->error_detected ()) + if (svc_handler->error_detected (leader_follower)) { svc_handler->cancel_pending_connection (); transport->purge_entry(); |