diff options
Diffstat (limited to 'TAO/tao/PortableServer/Regular_POA.inl')
| -rw-r--r-- | TAO/tao/PortableServer/Regular_POA.inl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tao/PortableServer/Regular_POA.inl b/TAO/tao/PortableServer/Regular_POA.inl index 04b4b4b091b..fa533b4991e 100644 --- a/TAO/tao/PortableServer/Regular_POA.inl +++ b/TAO/tao/PortableServer/Regular_POA.inl @@ -2,13 +2,13 @@ // // $Id$ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_INLINE PortableServer::POA_ptr TAO_Regular_POA::the_parent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { - return PortableServer::POA::_duplicate (this->parent_); + if (this->parent_ != 0) + return PortableServer::POA::_duplicate (this->parent_); + else + return PortableServer::POA::_nil (); } -TAO_END_VERSIONED_NAMESPACE_DECL |