diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-10 05:00:02 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-10 05:00:02 +0000 |
| commit | 0808dca1976712fdc0abdb1970368f2744c17bad (patch) | |
| tree | c43a363265d16bb4a450de9eed23b4812c7443be | |
| parent | 693d124414a86af85636f9d3918fdcfb3c5ad553 (diff) | |
| download | ATCD-0808dca1976712fdc0abdb1970368f2744c17bad.tar.gz | |
ChangeLogTag:Thu Mar 09 22:55:52 2000 Nanbor Wang <nanbor@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 13 | ||||
| -rw-r--r-- | TAO/tao/Servant_Base.cpp | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 11545b5f142..facbd6d006e 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Thu Mar 09 22:55:52 2000 Nanbor Wang <nanbor@cs.wustl.edu> + + * tao/Servant_Base.cpp (_create_stub): We must not use the stub + object until it is created. + Thu Mar 09 18:25:00 2000 Angelo Corsaro <corsaro@cs.wustl.edu> * TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h: @@ -9,18 +14,18 @@ Thu Mar 09 18:25:00 2000 Angelo Corsaro <corsaro@cs.wustl.edu> * TAO/orbsvcs/orbsvcs/CosEvent/ProxyPushSupplier_i.h: * TAO/orbsvcs/orbsvcs/CosEvent/SupplierAdmin_i.h: * TAO/orbsvcs/orbsvcs/AV/Transport.h: - + These files were using the #if !defined (WHATEVER) as multiple - inclusion guard instead of #ifndef WHATEVER. Thanks to Paul + inclusion guard instead of #ifndef WHATEVER. Thanks to Paul Calabrese <calabrese_p@ociweb.com> for reporting that. * TAO/orbsvcs/orbsvcs/AV/TCP.h: * TAO/orbsvcs/orbsvcs/Event/Debug_Macros.h: * TAO/orbsvcs/orbsvcs/Trader/Constraint_Tokens.h: - While this file were missing multiple inclusion guard. Thanks to + While this file were missing multiple inclusion guard. Thanks to Paul Calabrese <calabrese_p@ociweb.com> for reporting that. - + Thu Mar 09 16:22:10 2000 Irfan Pyarali <irfan@cs.wustl.edu> * tao/Servant_Base.cpp (_create_stub): Awesome detective work by diff --git a/TAO/tao/Servant_Base.cpp b/TAO/tao/Servant_Base.cpp index ffc2204d2e6..8456acb2dbd 100644 --- a/TAO/tao/Servant_Base.cpp +++ b/TAO/tao/Servant_Base.cpp @@ -135,8 +135,6 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV) } else { - servant_orb = stub->orb_core ()->orb (); - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); ACE_CHECK_RETURN (0); @@ -149,6 +147,8 @@ TAO_ServantBase::_create_stub (CORBA_Environment &ACE_TRY_ENV) // Increment the reference count since <object> will zap its // stub object on deletion. stub->_incr_refcnt (); + + servant_orb = stub->orb_core ()->orb (); } stub->servant_orb (servant_orb); |