diff options
author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-13 03:44:19 +0000 |
---|---|---|
committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-07-13 03:44:19 +0000 |
commit | 1a09d96d1eeca575a793cc2183bf598daa5c1ffa (patch) | |
tree | f10a949adad26071a1b58bf79bb696515ec7fce9 | |
parent | 95dd3071d3435c77cb0af701ebb99b3e185e91e0 (diff) | |
download | ATCD-1a09d96d1eeca575a793cc2183bf598daa5c1ffa.tar.gz |
ChangeLogTag:Thu Jul 12 20:40:51 2001 Ossama Othman <ossama@uci.edu>
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 6 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 8ae7c34bbed..062c1c5b352 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Thu Jul 12 20:40:51 2001 Ossama Othman <ossama@uci.edu> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp (connect): + + Corrected placement of an ACE_CHECK_RETURN statement. + Thu Jul 12 20:29:42 2001 Ossama Othman <ossama@uci.edu> * tao/ORB_Core.i (resolve_rt_orb, resolve_rt_current): diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 465ed5c646f..347e8fae2bb 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -161,8 +161,9 @@ TAO_SSLIOP_Connector::connect (TAO_GIOP_Invocation *invocation, if (!CORBA::is_nil (trust_policy.in ())) { tmp_trust = trust_policy->trust (ACE_TRY_ENV); - trust = &tmp_trust; ACE_CHECK_RETURN (-1); + + trust = &tmp_trust; } // Check if the user overrode the default Quality-of-Protection for |