diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-06-23 12:10:16 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2010-06-23 12:10:16 +0000 |
| commit | e109e918b7fa3ac9637bda0929e32bcd23ef9a8d (patch) | |
| tree | ad61f354718cf6fd7c2e1b6eb3441bfd33a5f433 | |
| parent | d7ed5a74f016e117900e687fa30f2e08b26fc003 (diff) | |
| download | ATCD-e109e918b7fa3ac9637bda0929e32bcd23ef9a8d.tar.gz | |
Wed Jun 23 12:08:51 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp:
Initialise pointer with 0
* DAnCE/LocalityManager/Scheduler/Events/Install.cpp:
When we get a CORBA exception, also log the _info from that exception
* DAnCE/NodeManager/Node_Manager_Module.cpp:
Removed debug line that seems to be a left over
| -rw-r--r-- | CIAO/ChangeLog | 11 | ||||
| -rw-r--r-- | CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp | 5 | ||||
| -rw-r--r-- | CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp | 6 | ||||
| -rw-r--r-- | CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp | 5 |
4 files changed, 16 insertions, 11 deletions
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 8a5bbcde8d5..307f8ce3f3b 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -1,3 +1,14 @@ +Wed Jun 23 12:08:51 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl> + + * DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp: + Initialise pointer with 0 + + * DAnCE/LocalityManager/Scheduler/Events/Install.cpp: + When we get a CORBA exception, also log the _info from that exception + + * DAnCE/NodeManager/Node_Manager_Module.cpp: + Removed debug line that seems to be a left over + Wed Jun 23 11:48:36 UTC 2010 Marcel Smit <msmit@remedy.nl> * connectors/dds4ccm/impl/dds/DomainParticipantFactory_T.cpp: diff --git a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp index f839ac7e5fb..39ffb4c43bc 100644 --- a/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp +++ b/CIAO/DAnCE/LocalityManager/Daemon/Locality_Manager_Impl.cpp @@ -1,9 +1,6 @@ // -*- C++ -*- // $Id$ -// TAO_IDL - Generated from -// be/be_codegen.cpp:1579 - #include "Locality_Manager_Impl.h" #include "Logger/Log_Macros.h" @@ -362,7 +359,7 @@ namespace DAnCE completed_events.size ())); } - ::Deployment::Connections *conn_cmp; + ::Deployment::Connections *conn_cmp = 0; ACE_NEW_THROW_EX (conn_cmp, ::Deployment::Connections (this->plan_.connection.length ()), CORBA::NO_MEMORY ()); diff --git a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp index b7c7283946a..e115db2885c 100644 --- a/CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp +++ b/CIAO/DAnCE/LocalityManager/Scheduler/Events/Install.cpp @@ -92,8 +92,9 @@ namespace DAnCE { DANCE_ERROR (3, (LM_ERROR, DLINFO ACE_TEXT ("Install_Instance::call - ") - ACE_TEXT ("Caught CORBA exception while installing instance ") + ACE_TEXT ("Caught CORBA exception <%C> while installing instance ") ACE_TEXT ("%u:<%C>\n"), + ex._info ().c_str (), this->instanceRef_, name)); CORBA::Any *tmp = 0; @@ -147,8 +148,9 @@ namespace DAnCE { DANCE_ERROR (3, (LM_ERROR, DLINFO ACE_TEXT ("Install_Instance::call - ") - ACE_TEXT ("CORBA Exception propagated from interceptors for instance ") + ACE_TEXT ("CORBA Exception <%C> propagated from interceptors for instance ") ACE_TEXT ("%u:<%C>\n"), + ex._info ().c_str (), this->instanceRef_, name)); diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp index 70ad129e062..110b32cdc40 100644 --- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp +++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp @@ -417,11 +417,6 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb, node_name = node_name.substring (0, npos); } - DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ") - ACE_TEXT ("Creating node named '%s' and outputting ior to file '%s'\n"), - node_name.c_str (), - node_file.c_str ())); - // load service modules for artifact installation service load_artifact_installation_modules (argc, argv); |