diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2003-10-28 18:31:01 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2003-10-28 18:31:01 +0000 |
| commit | c20c95d4d526d887c9782960a3ff73f63c3c1c85 (patch) | |
| tree | fd6ae8c3db752254802dfaafd1543974a4741e47 /TAO/tao/Object_Ref_Table.cpp | |
| parent | 3d20d6aedf2b56b86fe2a386777c7afbf1c19c93 (diff) | |
| download | ATCD-c20c95d4d526d887c9782960a3ff73f63c3c1c85.tar.gz | |
ChangeLogTag:Tue Oct 28 12:02:47 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/tao/Object_Ref_Table.cpp')
| -rw-r--r-- | TAO/tao/Object_Ref_Table.cpp | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/TAO/tao/Object_Ref_Table.cpp b/TAO/tao/Object_Ref_Table.cpp index cefeb86a369..af3503a9fef 100644 --- a/TAO/tao/Object_Ref_Table.cpp +++ b/TAO/tao/Object_Ref_Table.cpp @@ -1,10 +1,8 @@ #include "Object_Ref_Table.h" -#include "Object.h" #include "ORB.h" -#include "Exception.h" #include "Environment.h" -#include "CORBA_String.h" #include "debug.h" +#include "ORB_Constants.h" ACE_RCSID (tao, Object_Ref_Table, @@ -31,21 +29,27 @@ TAO_Object_Ref_Table::register_initial_reference ( ACE_ENV_ARG_DECL) { if (id == 0 || ACE_OS_String::strlen (id) == 0) - ACE_THROW (CORBA::ORB::InvalidName ()); + { + ACE_THROW (CORBA::ORB::InvalidName ()); + } else if (CORBA::is_nil (obj)) - ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, - CORBA::COMPLETED_NO)); + { + ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 27, + CORBA::COMPLETED_NO)); + } int result = this->bind (id, obj); if (result == 1) { if (TAO_debug_level > 1) - ACE_ERROR ((LM_ERROR, - "(%P|%t) Object_Ref_Table::register_initial_reference:\n" - " Could not register duplicate object <%s> with " - "the ORB\n", - id)); + { + ACE_ERROR ((LM_ERROR, + "(%P|%t) Object_Ref_Table::register_initial_reference:" + " Could not register duplicate object <%s> " + "with the ORB\n", + id)); + } ACE_THROW (CORBA::ORB::InvalidName ()); } @@ -54,7 +58,7 @@ TAO_Object_Ref_Table::register_initial_reference ( { if (TAO_debug_level > 1) ACE_ERROR ((LM_ERROR, - "(%P|%t) Object_Ref_Table::register_initial_reference:\n" + "(%P|%t) Object_Ref_Table::register_initial_reference:" " Could not register object <%s> with " "the ORB\n", id)); |