diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-03-19 17:32:33 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-03-19 17:32:33 +0000 |
| commit | acfc64887e3ea5ebc2a4d07f324c382ea9cf746e (patch) | |
| tree | abf8c11acaed55eb1fa24c8dc4360136e919c642 | |
| parent | 6e6851754591996846352bda336f29c4ae6ff204 (diff) | |
| download | ATCD-acfc64887e3ea5ebc2a4d07f324c382ea9cf746e.tar.gz | |
ChangeLogTag: Mon Mar 19 11:28:40 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 10 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.cpp | 22 | ||||
| -rw-r--r-- | TAO/tao/ORB_Core.i | 21 |
3 files changed, 33 insertions, 20 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 7cfb8710b38..3b3eeefe684 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,13 @@ +Mon Mar 19 11:28:40 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/ORB_Core.cpp: + * tao/ORB_Core.i: Moved the method service_context_list () from + the .i file to .cpp file. This was causing SunCC 4.2 to choke + when the debugging symbols were off and caused the clients + linked with TAO to dump a core. Thanks to Carlos for pointing me + for suggesting that some methods in .i file could be the source + of the problem. + Mon Mar 19 09:05:40 2001 Carlos O'Ryan <coryan@uci.edu> * tao/Typecode.cpp: diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index e78d852b20e..48ee1aaf242 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -1431,6 +1431,27 @@ TAO_ORB_Core::service_raise_transient_failure (TAO_GIOP_Invocation *invoke, } +void +TAO_ORB_Core::service_context_list ( + TAO_Stub *&stub, + IOP::ServiceContextList &service_list, + CORBA::Boolean restart, + CORBA::Environment &ACE_TRY_ENV) +{ + // @@ We look at the services if they are loaded. But if more + // services offer this feature we may want to keep expanding the + // 'if' conditions with a check for whether a service returned a + // valid Policy object. + if (this->ft_service_.service_callback ()) + { + this->ft_service_.service_callback ()->service_context_list (stub, + service_list, + restart, + ACE_TRY_ENV); + ACE_CHECK; + } +} + TAO_Client_Strategy_Factory * TAO_ORB_Core::client_factory (void) @@ -1958,6 +1979,7 @@ TAO_ORB_Core::run (ACE_Time_Value *tv, return result; } + void TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion, CORBA::Environment &ACE_TRY_ENV) diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i index 5f925f69b2d..b84892c001d 100644 --- a/TAO/tao/ORB_Core.i +++ b/TAO/tao/ORB_Core.i @@ -109,26 +109,7 @@ TAO_ORB_Core::object_is_nil (CORBA::Object_ptr obj) return retval; } -ACE_INLINE void -TAO_ORB_Core::service_context_list ( - TAO_Stub *&stub, - IOP::ServiceContextList &service_list, - CORBA::Boolean restart, - CORBA::Environment &ACE_TRY_ENV) -{ - // @@ We look at the services if they are loaded. But if more - // services offer this feature we may want to keep expanding the - // 'if' conditions with a check for whether a service returned a - // valid Policy object. - if (this->ft_service_.service_callback ()) - { - this->ft_service_.service_callback ()->service_context_list (stub, - service_list, - restart, - ACE_TRY_ENV); - ACE_CHECK; - } -} + ACE_INLINE void TAO_ORB_Core:: services_log_msg_rcv (TAO_Message_State_Factory &state) |