summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-07-24 11:40:52 +0000
committerdengg <dengg@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-07-24 11:40:52 +0000
commit7ce54a16ead87de65c2d5e9a757a1ab807d9a876 (patch)
tree06d46b567ff81ad0503c2c644fbf0126448d8e27
parentab37e6e8eeabb09b6f180cf1e67590e244d3a0a6 (diff)
downloadATCD-7ce54a16ead87de65c2d5e9a757a1ab807d9a876.tar.gz
Sun Jul 24 07:40:19 2005 Gan Deng <dengg@dre.vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog12
-rw-r--r--TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp4
-rw-r--r--TAO/CIAO/DAnCE/ciao/Container_Impl.cpp18
3 files changed, 24 insertions, 10 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 25a0ecbfa79..62068f8d9fc 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Sun Jul 24 07:40:19 2005 Gan Deng <dengg@dre.vanderbilt.edu>
+
+ * DAnCE/Plan_Launcher/Plan_Launcher.cpp
+
+ Enhanced error output information a little bit by
+ adding process ID and thread ID.
+
+ * DAnCE/ciao/Container_Impl.cpp
+
+ Fixed exception emulation warnings in Debian_Full_Reactor
+ build.
+
Sun Jul 24 01:19:21 2005 Gan Deng <dengg@dre.vanderbilt.edu>
* DAnCE/Plan_Launcher/Plan_Launcher.cpp
diff --git a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index 6391f881b84..e9fedb4f741 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -141,7 +141,7 @@ namespace CIAO
if (!launcher.init (use_naming ? 0 : ior_file,
orb.in ()))
{
- ACE_ERROR ((LM_ERROR, "Plan_Launcher: Error initializing the EM.\n"));
+ ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error initializing the EM.\n"));
return -1;
}
@@ -153,7 +153,7 @@ namespace CIAO
if (uuid == 0)
{
- ACE_ERROR ((LM_ERROR, "Plan_Launcher: Error launching plan\n"));
+ ACE_ERROR ((LM_ERROR, "(%P|%t) Plan_Launcher: Error launching plan\n"));
return -1;
}
diff --git a/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp b/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
index 1eedf8efc37..97a1006fd18 100644
--- a/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ciao/Container_Impl.cpp
@@ -429,7 +429,7 @@ CIAO::Container_Impl::register_with_ns (const char * obj_name,
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -439,7 +439,7 @@ CIAO::Container_Impl::register_with_ns (const char * obj_name,
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ ACE_TRY_CHECK;
// Create a Naming Sequence
CosNaming::Name name (1);
@@ -449,13 +449,14 @@ CIAO::Container_Impl::register_with_ns (const char * obj_name,
// Register with the Name Server
naming_context->bind (name, obj ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ ACE_TRY_CHECK;
return true;
}
ACE_CATCHANY
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NodeApplication: failed to register with naming service.");
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+ "(%P|%t) NodeApplication: failed to register with naming service.");
return false;
}
ACE_ENDTRY;
@@ -473,7 +474,7 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
CORBA::Object_var naming_obj =
orb->resolve_initial_references ("NameService"
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ ACE_TRY_CHECK;
if (CORBA::is_nil (naming_obj.in ()))
ACE_ERROR_RETURN ((LM_ERROR,
@@ -483,7 +484,7 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
CosNaming::NamingContext_var naming_context =
CosNaming::NamingContext::_narrow (naming_obj.in ()
ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ ACE_TRY_CHECK;
// Create a Naming Sequence
CosNaming::Name name (1);
@@ -494,13 +495,14 @@ CIAO::Container_Impl::unregister_with_ns (const char * obj_name,
// Register with the Name Server
ACE_DEBUG ((LM_DEBUG, "Unregister component with the name server : %s!\n", obj_name));
naming_context->unbind (name ACE_ENV_ARG_PARAMETER);
- ACE_CHECK_RETURN (false);
+ ACE_TRY_CHECK;
return true;
}
ACE_CATCHANY
{
- ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "NodeApplication: failed to unregister with naming service.");
+ ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+ "(%P|%t) NodeApplication: failed to unregister with naming service.");
return false;
}
ACE_ENDTRY;