diff options
| author | corsaro <corsaro@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-21 17:06:15 +0000 |
|---|---|---|
| committer | corsaro <corsaro@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2001-03-21 17:06:15 +0000 |
| commit | c9c7e97df4bdd42657620daaf02499c3f99e743f (patch) | |
| tree | 89e5728ce504c0c7f3ce6be95147b1d340eaedd1 | |
| parent | 7b5d7204533f9a2b67d8dd3b7ff82007a9641998 (diff) | |
| download | ATCD-c9c7e97df4bdd42657620daaf02499c3f99e743f.tar.gz | |
ChangeLogTag: Wed Mar 21 11:04:27 2001 Angelo Corsaro <corsaro@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 13 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/POA.cpp | 61 |
2 files changed, 41 insertions, 33 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 228a3529c07..41b973777b1 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,8 +1,15 @@ +Wed Mar 21 11:04:27 2001 Angelo Corsaro <corsaro@cs.wustl.edu> + + * tao/PortableServer/POA.cpp (key_to_stub_i): + + A part on non RTCORBA code was using an RTCORBA acceptor filter. + The problem has been fixed using the standard TAO acceptor filter. + Wed Mar 21 20:44:33 2001 Angelo Corsaro <corsaro@cs.wustl.edu> - * tests/RTCORBA/Banded_Connections/client.cpp: - - Fixed misleading error message. + * tests/RTCORBA/Banded_Connections/client.cpp: + + Fixed misleading error message. Wed Mar 21 07:05:40 2001 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/tao/PortableServer/POA.cpp b/TAO/tao/PortableServer/POA.cpp index 11f30b21836..e0fa15357a5 100644 --- a/TAO/tao/PortableServer/POA.cpp +++ b/TAO/tao/PortableServer/POA.cpp @@ -4137,14 +4137,15 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key, // If the POA has RTCORBA::SERVER_DECLARED priority model // then regardless of the fact that there are or that there // are not bands then we need to pass only one endpoint that - // is either the one associated to the bands to which the + // is either the one associated to the bands to which the // server belongs, or the one associated to the server priority. // - // If the POA has RTCORBA::CLIENT_EXPOSED, than all endpoints + // If the POA has RTCORBA::CLIENT_EXPOSED, than all endpoints // should be passed. #if (TAO_HAS_RT_CORBA == 1) - + + if (this->policies ().priority_model () == TAO_POA_Policies::SERVER_DECLARED) { @@ -4159,44 +4160,44 @@ TAO_POA::key_to_stub_i (const TAO_ObjectKey &key, client_exposed_policies._retn (), &filter, ACE_TRY_ENV); - ACE_CHECK_RETURN (0); + ACE_CHECK_RETURN (0); } else - { - RTCORBA::Priority object_priority = - this->policies ().server_priority () > priority ? this->policies ().server_priority () : priority; - TAO_Priority_Acceptor_Filter filter (this->policies ().server_protocol ()->protocols_rep (), - object_priority); - - data = this->orb_core_.create_stub_object (key, - type_id, - client_exposed_policies._retn (), - &filter, - ACE_TRY_ENV); - ACE_CHECK_RETURN (0); - } + { + RTCORBA::Priority object_priority = + this->policies ().server_priority () > priority ? this->policies ().server_priority () : priority; + TAO_Priority_Acceptor_Filter filter (this->policies ().server_protocol ()->protocols_rep (), + object_priority); + + data = this->orb_core_.create_stub_object (key, + type_id, + client_exposed_policies._retn (), + &filter, + ACE_TRY_ENV); + ACE_CHECK_RETURN (0); + } } else if (this->policies ().priority_model () - == TAO_POA_Policies::CLIENT_PROPAGATED) + == TAO_POA_Policies::CLIENT_PROPAGATED) { TAO_Server_Protocol_Acceptor_Filter filter ((this->policies ().server_protocol ()->protocols_rep ())); data = this->orb_core_.create_stub_object (key, - type_id, - client_exposed_policies._retn (), - &filter, - ACE_TRY_ENV); + type_id, + client_exposed_policies._retn (), + &filter, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); } - -#else - TAO_Server_Protocol_Acceptor_Filter filter ((this->policies ().server_protocol ()->protocols_rep ())); + +#else /* NON-RT-CORBA Section */ + data = this->orb_core_.create_stub_object (key, - type_id, - client_exposed_policies._retn (), - &filter, - ACE_TRY_ENV); + type_id, + client_exposed_policies._retn (), + this->accepor_filter_, + ACE_TRY_ENV); ACE_CHECK_RETURN (0); - + #endif /* TAO_HAS_RT_CORBA */ |