diff options
Diffstat (limited to 'TAO/orbsvcs')
| -rw-r--r-- | TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp index afe256b1101..afc83e3409f 100644 --- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo_i.cpp @@ -98,6 +98,7 @@ ImplRepo_i::activate_server_i (const char *server, ImplementationRepository::Administration::NotFound, ImplementationRepository::Administration::CannotActivate)) { + ImplRepo_i::Endpoint default_ep; // Default to be used by exceptions int start = 0; ACE_TString server_object_ior, host; unsigned short port; @@ -116,7 +117,7 @@ ImplRepo_i::activate_server_i (const char *server, ACE_ERROR ((LM_ERROR, "Error: Cannot find startup info for server <%s>\n", server)); - ACE_THROW_RETURN(ImplementationRepository::Administration::NotFound (), ImplRepo_i::Endpoint ()); + ACE_THROW_RETURN(ImplementationRepository::Administration::NotFound (), default_ep); } // Find out if it is already running @@ -127,7 +128,7 @@ ImplRepo_i::activate_server_i (const char *server, ACE_ERROR ((LM_ERROR, "Error: Cannot find ServerObject IOR for server <%s>\n", server)); - ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), ImplRepo_i::Endpoint ()); + ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), default_ep); } // Check to see if there is one running (if there is a server_object_ior) @@ -151,7 +152,7 @@ ImplRepo_i::activate_server_i (const char *server, ACE_ERROR ((LM_ERROR, "Error: Invalid ServerObject IOR: <%s>\n", server_object_ior.c_str ())); - ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), ImplRepo_i::Endpoint ()); + ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), default_ep); } // Check to see if we can ping it @@ -177,7 +178,7 @@ ImplRepo_i::activate_server_i (const char *server, ACE_THROW_RETURN (CORBA::TRANSIENT ( CORBA_SystemException::_tao_minor_code (TAO_IMPLREPO_SERVER_MANUAL_ACTIVATION, 0), CORBA::COMPLETED_NO), - ImplRepo_i::Endpoint ()); + default_ep); // Check to see if it is already starting up int startup_val = this->repository_.starting_up (server, 1); @@ -187,7 +188,7 @@ ImplRepo_i::activate_server_i (const char *server, ACE_ERROR ((LM_ERROR, "Error: Cannot find startup info for server <%s>\n", server)); - ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), ImplRepo_i::Endpoint ()); + ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), default_ep); } if (startup_val == 0) @@ -199,7 +200,7 @@ ImplRepo_i::activate_server_i (const char *server, "Error: No startup information for server <%s>\n", server)); // @@ (brunsch) Should this be a more specific transient exception? - ACE_THROW_RETURN (CORBA::TRANSIENT (), ImplRepo_i::Endpoint ()); + ACE_THROW_RETURN (CORBA::TRANSIENT (), default_ep); } @@ -220,7 +221,7 @@ ImplRepo_i::activate_server_i (const char *server, server, startup.c_str ())); ACE_THROW_RETURN (ImplementationRepository::Administration::CannotActivate (CORBA::string_dup ("N/A")), - ImplRepo_i::Endpoint ()); + default_ep); } } @@ -245,7 +246,7 @@ ImplRepo_i::activate_server_i (const char *server, ACE_ERROR ((LM_ERROR, "Error: Cannot find startup info for server <%s>\n", server)); - ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), ImplRepo_i::Endpoint ()); + ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), default_ep); } // Now it should be started. @@ -265,7 +266,7 @@ ImplRepo_i::activate_server_i (const char *server, ACE_ERROR ((LM_ERROR, "Error: Could not update information for server <%s>\n", server)); - ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), ImplRepo_i::Endpoint ()); + ACE_THROW_RETURN (ImplementationRepository::Administration::NotFound (), default_ep); } } |