diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-07-27 14:09:37 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-07-27 14:09:37 +0000 |
| commit | 341c4c862090dfba6e61e4ca404ebdc2dc808118 (patch) | |
| tree | 28c1e041d9aa18c8011c08c924e75bcf4087c3a8 | |
| parent | 5ac97b81774fd0643126a8c1b3a56844d1ae25cd (diff) | |
| download | ATCD-341c4c862090dfba6e61e4ca404ebdc2dc808118.tar.gz | |
ChangeLogTag:Sun Jul 27 09:06:02 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/tao/Stub.cpp | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 2f362e4711e..61ea42351c0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Sun Jul 27 09:06:02 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Stub.cpp (get_policy): Removed the check for this->policies_ + == 0. This is actually bogus since the get_client_policy () does + all the checks. Moreover, if the policy is set on Current or on + the PolicyManager, we could by mistake a return a null + policy. Thanks to Chris <xfrog2000@yahoo.com> for reporting this + problem. + Sun Jul 27 07:29:51 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/Exception.h: diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 3a57b674988..9f38e68f274 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -459,10 +459,6 @@ CORBA::Policy_ptr TAO_Stub::get_policy (CORBA::PolicyType type ACE_ENV_ARG_DECL) { - - if (this->policies_ == 0) - return CORBA::Policy::_nil (); - // Some policies can only be set locally on the client, while others // can only be exported in the IOR by the server, and yet others can // be set by both by client and server. Furthermore, reconciliation |