diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-31 10:01:08 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-08-31 10:01:08 +0000 |
| commit | 6f4187a98f877560b1bf03dcf2f3d48ef34cd242 (patch) | |
| tree | 82b258c080d6f8efcc71b659ff8e268b0ee1d6c3 /TAO/tao/PortableServer | |
| parent | af96b33e569917d56f9d677de4b976d17bfabca2 (diff) | |
| download | ATCD-6f4187a98f877560b1bf03dcf2f3d48ef34cd242.tar.gz | |
ChangeLogTag: Wed Aug 31 10:00:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer')
| -rw-r--r-- | TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/LifespanStrategyPersistent.cpp | 1 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index a027ffd58a0..dbd38fd621c 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -32,8 +32,7 @@ TAO_Default_Servant_Dispatcher::create_Root_POA (const ACE_CString &name, thread_lock, orb_core, object_adapter - ACE_ENV_ARG_PARAMETER), - CORBA::NO_MEMORY ()); + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); ACE_CHECK_RETURN (0); return poa; diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 21fba88fcc9..5e40ac9785a 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -123,6 +123,7 @@ namespace TAO if (adapter != 0) { adapter->imr_notify_shutdown (this->poa_ ACE_ENV_ARG_PARAMETER); + ACE_CHECK; } } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index 0e0e3fc5a7d..87cf5b4defe 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -49,8 +49,8 @@ namespace TAO !poa->allow_multiple_activations (), poa->is_persistent (), poa->orb_core().server_factory ()->active_object_map_creation_parameters () - ACE_ENV_ARG_PARAMETER), - CORBA::NO_MEMORY ()); + ACE_ENV_ARG_PARAMETER), CORBA::NO_MEMORY ()); + ACE_CHECK; // Give ownership of the new map to the auto pointer. Note, that it // is important for the auto pointer to take ownership before |